fenix/fdk-aac
1
0
Fork 0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-02-01 16:36:43 +01:00
Code Issues Projects Releases Wiki Activity
1,741 Commits 10 Branches 11 Tags 9.6 MiB
Commit Graph

1741 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Michel Trivi
a6afc4ee44 Merge "Correct comment spelling error." am: 0f065e796b am: 18cb3fccf6 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2519657

Change-Id: I9219ef758ffb43804959a70204dce05de88447ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 21:07:12 +00:00
Jean-Michel Trivi
18cb3fccf6 Merge "Correct comment spelling error." am: 0f065e796b 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2519657

Change-Id: Ifeddd337fb8c4b648aaafb8c86c94ea4fa904f76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 20:24:48 +00:00
Jean-Michel Trivi
0f065e796b Merge "Correct comment spelling error." 2023-04-04 19:59:06 +00:00
wujianxing1
477ac94c2d Correct comment spelling error. 
Change-Id: I2b0451986e70d0fbb7fefa5bbb95b1ca98e4f7ac
Signed-off-by: wujianxing1 <wujianxing1@xiaomi.corp-partner.google.com>
 2023-04-03 17:06:00 +08: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
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
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
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
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 f02e2ba58f6c161ea1792ed180242ba7d6b849e0 to sc-qpr3-release 
Change-Id: Iede59048bfac7adc5daa9359fed3c2295873637c
 2022-04-07 23:03:13 +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
fa729ee567 [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 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: Ifa61b6b854648dcbbb432aa4b1ac6fa7c5189202
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:42:34 +00:00
Fraunhofer IIS FDK
4fbaa71c4d [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: 87ad6b892f -s ours am: 6dec10523f -s ours am: 30bf020509 -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: I35e2eb134c62d9d9e58ff69784baa27d2a1290a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:26:00 +00:00
Fraunhofer IIS FDK
7561fa0250 [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 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: I620d85b4660c8c54cb9cca32278bace0f7f8495b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:25:34 +00:00
Fraunhofer IIS FDK
30bf020509 [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: 87ad6b892f -s ours am: 6dec10523f -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: Ie22e428d0e427f9fb391a1e1a3847cf135c89bad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:03:12 +00:00
Fraunhofer IIS FDK
e72924914c [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 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: I58f79bbd56888233a5d4e80f55db0c12fd4245e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:01:19 +00:00
Fraunhofer IIS FDK
f02e2ba58f [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 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: Ieacfcbb28bd8f356162a8d3cc92a350a2d03f0b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:26:13 +00:00
Fraunhofer IIS FDK
6dec10523f [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: 87ad6b892f -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: I427569d2b8d9e9d91456219fc11352e319024e1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:26:06 +00:00
Fraunhofer IIS FDK
0683f8f469 [automerger skipped] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. am: 6a3817573b -s ours am: 156794b105 -s ours am: f95792e18c -s ours am: 1193b11357 -s ours am: 38c4d6c261 -s ours am: 359fb4ca09 -s ours 
am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 b297bcbf2a is already in history

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

Change-Id: I3b27ac744c33f1f9c356f1bafc4bf52209ea90ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:17:11 +00:00
Fraunhofer IIS FDK
c9ba3de5b8 [automerger skipped] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. am: b297bcbf2a -s ours am: 6b001a123c -s ours am: 2c6782ab76 -s ours am: 4f7627cd19 -s ours am: 52496856d5 -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/+/17614692

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