fenix/fdk-aac
1
0
Fork 0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-06-05 22:39:13 +02:00
Code Issues Projects Releases Wiki Activity
1,790 Commits 9 Branches 11 Tags
7cb7d8c181837f437152a8edcfd3c0f9c6e3f68c
Commit Graph

1790 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Martin Storsjo
7cb7d8c181 Update the version numbers in the public installed headers 
Bug: 261048742
Test: atest android.media.encoder.cts.EncoderTest
Change-Id: I44537c067e6ef34e77a67d02d8e9a8e9dfffab92
 2022-12-09 04:19:16 +00:00
Martin Storsjo
32c697660d Include the encoder library version in the publicly installed header 
This allows callers to conditionally use new API features without
breaking compatibility with the earlier versions of the library.

Bug: 261048742
Test: atest android.media.encoder.cts.EncoderTest
Change-Id: Icdf18317e120caf8be750a839ae75a6ac8eba142
 2022-12-01 21:48:47 +00:00
Treehugger Robot
2032bc891f Merge "Add riscv64 support" am: 75e9f62078 am: 87b22603e8 am: a30d828f33 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2171525

Change-Id: I0d4764f69e5075df012ee7ad7c059881dcff69d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-04 23:46:45 +00:00
Treehugger Robot
a30d828f33 Merge "Add riscv64 support" am: 75e9f62078 am: 87b22603e8 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2171525

Change-Id: If1c06433eb568c9823c89d86ba6686ac4ac7366d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-04 23:13:55 +00:00
Treehugger Robot
87b22603e8 Merge "Add riscv64 support" am: 75e9f62078 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2171525

Change-Id: I4d5851ffc1e5e1892ec83209045ccf3bf4b188cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-04 22:29:53 +00:00
Treehugger Robot
75e9f62078 Merge "Add riscv64 support" 2022-11-04 21:52:02 +00:00
Treehugger Robot
433a135d67 Merge "[Bluetooth apex] Use new apex name" am: f9820781d9 am: 82c5dbb07b am: 1b918d8de0 am: 34effe2f68 am: 6097888451 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2192087

Change-Id: Ib205b865950336bf275640c891fd111ca8c1e22d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 01:14:36 +00:00
Treehugger Robot
6097888451 Merge "[Bluetooth apex] Use new apex name" am: f9820781d9 am: 82c5dbb07b am: 1b918d8de0 am: 34effe2f68 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2192087

Change-Id: I90093847a2efe1b5af80f14712353a3531e1c9c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 00:28:39 +00:00
Treehugger Robot
34effe2f68 Merge "[Bluetooth apex] Use new apex name" am: f9820781d9 am: 82c5dbb07b am: 1b918d8de0 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2192087

Change-Id: Ic2dda304ecfb4d8c520c30ffd95b704497260d03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 23:33:49 +00:00
Treehugger Robot
1b918d8de0 Merge "[Bluetooth apex] Use new apex name" am: f9820781d9 am: 82c5dbb07b 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2192087

Change-Id: I20beda4ed1fcf0a060e0ca03d6e76a161d499aeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 23:03:06 +00:00
Treehugger Robot
82c5dbb07b Merge "[Bluetooth apex] Use new apex name" am: f9820781d9 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2192087

Change-Id: Iaea278a4c8c276598c1d9d7b6a6495a2faad0591
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 21:40:31 +00:00
Treehugger Robot
f9820781d9 Merge "[Bluetooth apex] Use new apex name" 2022-08-23 21:05:13 +00:00
William Escande
2bb735c4fb [Bluetooth apex] Use new apex name 
The Bluetooth apex name is now called com.android.btservices

Bug: 243054261
Test: Build
Change-Id: I504a8727ddf73d3568616bc0f57983331dd28744
 2022-08-22 11:27:53 -07:00
haocheng.zy
3aabcb6abd Add riscv64 support 
Signed-off-by: Zhang Ye <haocheng.zy@linux.alibaba.com>
Signed-off-by: Mao Han <han_mao@linux.alibaba.com>

Change-Id: Ifc1c8801d885b0b4ac1bf91842830ab650780328
 2022-08-01 16:27:30 +08:00
Treehugger Robot
de4a1d6125 [automerger skipped] Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: 2231acfd62 am: 8f53fdaaa6 am: 8da1061f74 am: 2c2abe9736 am: 9cf12aa868 -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2128078

Change-Id: Ia697176fcde810faa01a30e669cd17cd7a921dce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 22:58:34 +00:00
Xin Li
af845c3530 [automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: bc7c5b55b5 am: 181d0ef5e2 am: 94a09cf355 am: a5b4e7363f am: 580e9caedd -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2128078

Change-Id: Ieb7e5a23c273f1c4419316fb4ea9f0e5e8246b8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 22:57:46 +00:00
Treehugger Robot
9cf12aa868 Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: 2231acfd62 am: 8f53fdaaa6 am: 8da1061f74 am: 2c2abe9736 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2128078

Change-Id: I8ef7094e0c67b956b2c7302a247b26323cdd9879
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 22:32:46 +00:00
Xin Li
580e9caedd DO NOT MERGE - Skip SQ3A.220605.009 am: bc7c5b55b5 am: 181d0ef5e2 am: 94a09cf355 am: a5b4e7363f 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2128078

Change-Id: Ib7c8008cf259618654de2d4a9c23fc26310741ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 22:32:00 +00:00
Treehugger Robot
2c2abe9736 Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: 2231acfd62 am: 8f53fdaaa6 am: 8da1061f74 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2128078

Change-Id: I4018d2e225aefd674fddc8691cfeb0c9d2a3ac8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 22:03:17 +00:00
Xin Li
a5b4e7363f DO NOT MERGE - Skip SQ3A.220605.009 am: bc7c5b55b5 am: 181d0ef5e2 am: 94a09cf355 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2128078

Change-Id: Ia1f3936ec9a751e6bc8e9b31e5130976b0bd2276
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 22:02:32 +00:00
Xin Li
d722264e24 [automerger skipped] Merge "Merge Android 12 QPR 3" am: cb00f5235d -s ours am: 5ccfd6ac78 -s ours am: 1a013376bd -s ours am: 2e02d4c91c -s ours am: 85b17c8c10 -s ours 
am skip reason: Merged-In I4df938df7886adc58185586190e27bcd16e17966 with SHA-1 1f830f7196 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2126004

Change-Id: Idfdf539fd4874772c3bef65519ddaec869361b37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 21:34:51 +00:00
Xin Li
e579056830 [automerger skipped] Merge Android 12 QPR 3 am: 0ace73f2d3 -s ours am: 3c9fe29541 -s ours am: 3d2637ce9a -s ours am: 9eb437d8ca -s ours am: f7594a4c73 -s ours 
am skip reason: Merged-In I4df938df7886adc58185586190e27bcd16e17966 with SHA-1 1f830f7196 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2126004

Change-Id: If0480b81892c6f79f4a6c3cd58f523d6ae82d127
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 21:33:36 +00:00
Treehugger Robot
8da1061f74 Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: 2231acfd62 am: 8f53fdaaa6 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2128078

Change-Id: I17ca4d9dc314d0b286708b079cdb9464be99e942
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 21:28:06 +00:00
Xin Li
94a09cf355 DO NOT MERGE - Skip SQ3A.220605.009 am: bc7c5b55b5 am: 181d0ef5e2 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2128078

Change-Id: I5e56b7dd29b51efb2fb330832f7b990d5f735408
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 21:27:24 +00:00
Xin Li
85b17c8c10 [automerger skipped] Merge "Merge Android 12 QPR 3" am: cb00f5235d -s ours am: 5ccfd6ac78 -s ours am: 1a013376bd -s ours am: 2e02d4c91c -s ours 
am skip reason: Merged-In I4df938df7886adc58185586190e27bcd16e17966 with SHA-1 1f830f7196 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2126004

Change-Id: I32589f68cdaf3ae48930b21947e79d615b4d41b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 20:54:00 +00:00
Xin Li
f7594a4c73 [automerger skipped] Merge Android 12 QPR 3 am: 0ace73f2d3 -s ours am: 3c9fe29541 -s ours am: 3d2637ce9a -s ours am: 9eb437d8ca -s ours 
am skip reason: Merged-In I4df938df7886adc58185586190e27bcd16e17966 with SHA-1 1f830f7196 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2126004

Change-Id: Ife4349f0a7ab64120e0bb4fba0c6e1b72465ad49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 20:52:43 +00:00
Treehugger Robot
8f53fdaaa6 Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: 2231acfd62 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2128078

Change-Id: If09f84637bfd45a2ded9516104de2e7ae520d402
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 20:07:13 +00:00
Xin Li
181d0ef5e2 DO NOT MERGE - Skip SQ3A.220605.009 am: bc7c5b55b5 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2128078

Change-Id: I5cf15e7b63c5874ada7ec110523d5f1e2bb83157
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 20:06:26 +00:00
Xin Li
2e02d4c91c [automerger skipped] Merge "Merge Android 12 QPR 3" am: cb00f5235d -s ours am: 5ccfd6ac78 -s ours am: 1a013376bd -s ours 
am skip reason: Merged-In I4df938df7886adc58185586190e27bcd16e17966 with SHA-1 1f830f7196 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2126004

Change-Id: I42c52aac9bcff66d7dbeb5da3964bc1039827306
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 19:57:41 +00:00
Xin Li
9eb437d8ca [automerger skipped] Merge Android 12 QPR 3 am: 0ace73f2d3 -s ours am: 3c9fe29541 -s ours am: 3d2637ce9a -s ours 
am skip reason: Merged-In I4df938df7886adc58185586190e27bcd16e17966 with SHA-1 1f830f7196 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2126004

Change-Id: Ie7f7e1b880623ccf0377038c48ad0bec25ebf7fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 19:56:25 +00:00
Treehugger Robot
2231acfd62 Merge "DO NOT MERGE - Skip SQ3A.220605.009" 2022-06-17 14:29:01 +00:00
Xin Li
bc7c5b55b5 DO NOT MERGE - Skip SQ3A.220605.009 
Bug: 236045730
Merged-In: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
Change-Id: Ie0ca07f0aa6ea25a02e3702745c1ab1b6fd55bc9
 2022-06-16 22:50:42 -07:00
Xin Li
1a013376bd [automerger skipped] Merge "Merge Android 12 QPR 3" am: cb00f5235d -s ours am: 5ccfd6ac78 -s ours 
am skip reason: Merged-In I4df938df7886adc58185586190e27bcd16e17966 with SHA-1 1f830f7196 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2126004

Change-Id: Ic35150ce86342d8abe9bfc0f77c0b255c3ec7d42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 00:15:36 +00:00
Xin Li
3d2637ce9a [automerger skipped] Merge Android 12 QPR 3 am: 0ace73f2d3 -s ours am: 3c9fe29541 -s ours 
am skip reason: Merged-In I4df938df7886adc58185586190e27bcd16e17966 with SHA-1 1f830f7196 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2126004

Change-Id: I9f4e52edb80ba867982c657f12f79b2fe2a17e3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 00:14:20 +00:00
Xin Li
5ccfd6ac78 [automerger skipped] Merge "Merge Android 12 QPR 3" am: cb00f5235d -s ours 
am skip reason: Merged-In I4df938df7886adc58185586190e27bcd16e17966 with SHA-1 1f830f7196 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2126004

Change-Id: I7881f686f3011850e299efde8c2588f5d7ceaff6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 19:58:37 +00:00
Xin Li
3c9fe29541 [automerger skipped] Merge Android 12 QPR 3 am: 0ace73f2d3 -s ours 
am skip reason: Merged-In I4df938df7886adc58185586190e27bcd16e17966 with SHA-1 1f830f7196 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2126004

Change-Id: If8b5a0cf1530fd8f49ceda4fd767bf4f67827e1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 19:57:13 +00:00
Xin Li
cb00f5235d Merge "Merge Android 12 QPR 3" 2022-06-16 18:51:56 +00:00
Xin Li
0ace73f2d3 Merge Android 12 QPR 3 
Bug: 236045730
Merged-In: I4df938df7886adc58185586190e27bcd16e17966
Change-Id: I14c070faf59e63c6fac783faf8f8f5ec41609c29
 2022-06-14 16:48:08 -07:00
Xin Li
561c0dbba0 [automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: 1f830f7196 -s ours am: 456ba9e186 -s ours am: 9192d46a8a -s ours am: 09023836cb -s ours 
am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 23ef1ac38c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17805627

Change-Id: I8bd2fd5d97bc02766b1eb9182ab12b0763017343
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 13:49:43 +00:00
Xin Li
09023836cb [automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: 1f830f7196 -s ours am: 456ba9e186 -s ours am: 9192d46a8a -s ours 
am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 23ef1ac38c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17805627

Change-Id: I42922a84bff598191dd22fa9dad1fc7022a2f2a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 13:05:25 +00:00
Xin Li
30772487bf [automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: 1f830f7196 -s ours am: 456ba9e186 -s ours am: 9192d46a8a -s ours am: 7e1fb037c7 -s ours am: 2c16a17358 -s ours 
am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 23ef1ac38c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17805627

Change-Id: Ia644755696ea531375453e840f4c605e85b80246
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 06:17:10 +00:00
Xin Li
2c16a17358 [automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: 1f830f7196 -s ours am: 456ba9e186 -s ours am: 9192d46a8a -s ours am: 7e1fb037c7 -s ours 
am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 23ef1ac38c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17805627

Change-Id: I9eb7a01dbe13825311174b700169cd7b8387fc4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 05:33:18 +00:00
Xin Li
7e1fb037c7 [automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: 1f830f7196 -s ours am: 456ba9e186 -s ours am: 9192d46a8a -s ours 
am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 23ef1ac38c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17805627

Change-Id: Iff0bc9acb8d2f99e7bdddb84bd8e054255e09373
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 05:13:25 +00:00
Xin Li
9192d46a8a [automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: 1f830f7196 -s ours am: 456ba9e186 -s ours 
am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 23ef1ac38c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17805627

Change-Id: I5681a91da0fd07d4d7d63c2121b614f209aefada
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 04:47:31 +00:00
Xin Li
456ba9e186 [automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: 1f830f7196 -s ours 
am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 23ef1ac38c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17805627

Change-Id: I3fcfa21a61f634331f58d03e3a11fc0ec8953192
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 00:08:15 +00:00
Xin Li
1f830f7196 Merge sc-v2-dev-plus-aosp-without-vendor@8433047 
Bug: 226662282
Merged-In: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
Change-Id: I4df938df7886adc58185586190e27bcd16e17966
 2022-04-18 21:01:07 +00:00
Android Build Coastguard Worker
67dcccc111 Snap for 8417597 from f02e2ba58f to sc-qpr3-release 
Change-Id: Iede59048bfac7adc5daa9359fed3c2295873637c
 2022-04-07 23:03:13 +00:00
Fraunhofer IIS FDK
867aec8205 [automerger skipped] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. am: eb07c22519 am: 2b57d2b0be -s ours am: 16585e6174 -s ours am: 8c56a3bf71 -s ours am: 8b6f2f0af5 -s ours am: 4942ddcaac -s ours am: f02e2ba58f -s ours am: e72924914c -s ours am: 7561fa0250 -s ours am: fa729ee567 -s ours am: ab1e0835ba -s ours 
am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 6a3817573b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615048

Change-Id: I0d33be64ae506ca570a5291700599c10b186d08c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 03:23:54 +00:00
Fraunhofer IIS FDK
ab1e0835ba [automerger skipped] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. am: eb07c22519 am: 2b57d2b0be -s ours am: 16585e6174 -s ours am: 8c56a3bf71 -s ours am: 8b6f2f0af5 -s ours am: 4942ddcaac -s ours am: f02e2ba58f -s ours am: e72924914c -s ours am: 7561fa0250 -s ours am: fa729ee567 -s ours 
am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 6a3817573b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615048

Change-Id: Id72d27f6d8143c2aa97d47df9d072baaedd623f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 03:03:58 +00:00
Fraunhofer IIS FDK
5f780d725f [automerger skipped] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. am: eb07c22519 am: 2b57d2b0be -s ours am: 16585e6174 -s ours am: 8c56a3bf71 -s ours am: 8b6f2f0af5 -s ours am: 4942ddcaac -s ours am: f02e2ba58f -s ours am: e72924914c -s ours am: 7561fa0250 -s ours am: 2549017265 -s ours 
am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 6a3817573b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615048

Change-Id: I14adb2a9fdbde97b193add99a35dfa7a01eb85f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 03:03:05 +00:00