fenix/fdk-aac
1
0
Fork 0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-02-16 19:30:34 +01:00
Code Issues Projects Releases Wiki Activity
2,118 Commits 10 Branches 11 Tags
Commit Graph

2118 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fraunhofer IIS FDK
6b001a123c [automerger skipped] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. am: b297bcbf2a -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: I5f682fc32640b62e99c3d27a52a707084f4d9699
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 22:47:29 +00:00
Fraunhofer IIS FDK
156794b105 [automerger skipped] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. am: 6a3817573b -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: Ie0df904e14408f20118d07e9d416c27b52d2f908
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 22:47:18 +00:00
Fraunhofer IIS FDK
fa701f794c [automerger skipped] [automerge] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. 2p: 2768a078f3 am: d787bdd639 -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/+/17615051

Change-Id: Ie699de60dc56fbb19dc4a9cd27c03235515df69f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 21:59:46 +00:00
Ray Essick
b5da046e74 Merge changes from topic "presubmit-am-7d8337c3813a47e19898b70f395cf7ea-git_mainline-module-media_swcodec-release-rvc-qpr-dev-sc-dev" into tm-mainline-prod 
* changes:
  [automerge] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. 2p: 50d66655ca 2p: b70aa8fe34
  [automerge] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. 2p: 23ef1ac38c 2p: 50d66655ca
  [automerge] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. 2p: 23ef1ac38c
  Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation.
 2022-04-06 21:45:21 +00:00
Ray Essick
50b881083a Merge changes from topic "presubmit-am-7d8337c3813a47e19898b70f395cf7ea-git_mainline-module-media_swcodec-release-rvc-qpr-dev-sc-dev" into tm-dev 
* changes:
  [automerge] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. 2p: 23ef1ac38c 2p: 50d66655ca
  [automerge] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. 2p: 23ef1ac38c
  Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation.
 2022-04-06 21:45:21 +00:00
Ray Essick
e30dba06e7 Merge changes from topic "presubmit-am-7d8337c3813a47e19898b70f395cf7ea-git_mainline-module-media_swcodec-release-rvc-qpr-dev-sc-dev" 
* changes:
  [automerge] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. 2p: b70aa8fe34 2p: 72b79304b5
  [automerge] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. 2p: 50d66655ca 2p: b70aa8fe34
  [automerge] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. 2p: 23ef1ac38c 2p: 50d66655ca
  [automerge] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. 2p: 23ef1ac38c
  Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation.
 2022-04-06 21:45:21 +00:00
Fraunhofer IIS FDK
be9f009724 [automerger skipped] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. am: 067929dcd3 am: 83f9450b43 am: 8cadcc08e4 -s ours 
am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 067929dcd3 is already in history

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

Change-Id: I0131a1a62f0359a14456a5a65844a9d0f10ef87e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 21:09:25 +00:00
Fraunhofer IIS FDK
8cadcc08e4 Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. am: 067929dcd3 am: 83f9450b43 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615043

Change-Id: I0d627e2a8f8a11f1736aaa45e70bd2b8ceef9d97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 20:52:06 +00:00
Fraunhofer IIS FDK
83f9450b43 Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. am: 067929dcd3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615043

Change-Id: I2a93360d07eed2f773ef9612b1c2ea745dfd5fb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 20:19:39 +00:00
Fraunhofer IIS FDK
7b71c53352 [automerge] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. 2p: b70aa8fe34 2p: 72b79304b5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615057

Bug: 224314979
Bug: 221734266
Change-Id: I27ebd021f8bfe0d8b4237be35ba584adcb216689
Merged-In: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
 2022-04-06 05:06:19 +00:00
Fraunhofer IIS FDK
72b79304b5 [automerge] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. 2p: 50d66655ca 2p: b70aa8fe34 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615057

Bug: 224314979
Bug: 221734266
Change-Id: Ie6f6b59eb6b7602a90c550e4f7f4c1ada59d73f4
Merged-In: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
 2022-04-06 05:06:11 +00:00
Fraunhofer IIS FDK
b70aa8fe34 [automerge] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. 2p: 23ef1ac38c 2p: 50d66655ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615057

Bug: 224314979
Bug: 221734266
Change-Id: I41a977f7513be7f6df072011524a4870ac08dfab
Merged-In: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
 2022-04-06 05:06:03 +00:00
Fraunhofer IIS FDK
50d66655ca [automerge] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. 2p: 23ef1ac38c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615057

Bug: 224314979
Bug: 221734266
Change-Id: I5ec75e235f096a4e8bd7e82ea3bf5f99353078af
Merged-In: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
 2022-04-06 05:05:51 +00:00
Fraunhofer IIS FDK
23ef1ac38c Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. 
Bug: 224314979
Bug: 221734266
Test: adb shell /data/fuzz/arm64/C2FuzzerAacDec/C2FuzzerAacDec /data/local/tmp/clusterfuzz-testcase-minimized-C2FuzzerAacDec-5461414938804224
Test: adb shell /data/fuzz/arm64/C2FuzzerAacDec/C2FuzzerAacDec /data/local/tmp/clusterfuzz-testcase-minimized-C2FuzzerAacDec-5062403589275648

Change-Id: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
Merged-In: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
 2022-04-06 05:05:39 +00:00
Fraunhofer IIS FDK
b297bcbf2a Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. 
Bug: 224314979
Bug: 221734266
Test: adb shell /data/fuzz/arm64/C2FuzzerAacDec/C2FuzzerAacDec /data/local/tmp/clusterfuzz-testcase-minimized-C2FuzzerAacDec-5461414938804224
Test: adb shell /data/fuzz/arm64/C2FuzzerAacDec/C2FuzzerAacDec /data/local/tmp/clusterfuzz-testcase-minimized-C2FuzzerAacDec-5062403589275648

Change-Id: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
Merged-In: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
 2022-04-06 05:04:55 +00:00
Presubmit Automerger Backend
9923d51ded [automerge] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. 2p: 067929dcd3 2p: 9fb873a6ea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615043

Bug: 224314979
Bug: 221734266
Change-Id: Iff53639a3bc01005edd5775d7951c44a51cb4cac
Merged-In: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
 2022-04-06 04:46:43 +00:00
Presubmit Automerger Backend
9fb873a6ea [automerge] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. 2p: 067929dcd3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615043

Bug: 224314979
Bug: 221734266
Change-Id: I69b28b6fc5e23e4023d89815e61e6778631105b7
Merged-In: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
 2022-04-06 04:46:35 +00:00
Fraunhofer IIS FDK
067929dcd3 Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. 
Bug: 224314979
Bug: 221734266
Test: adb shell /data/fuzz/arm64/C2FuzzerAacDec/C2FuzzerAacDec /data/local/tmp/clusterfuzz-testcase-minimized-C2FuzzerAacDec-5461414938804224
Test: adb shell /data/fuzz/arm64/C2FuzzerAacDec/C2FuzzerAacDec /data/local/tmp/clusterfuzz-testcase-minimized-C2FuzzerAacDec-5062403589275648

Change-Id: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
Merged-In: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
 2022-04-06 04:46:26 +00:00
Fraunhofer IIS FDK
d787bdd639 [automerge] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. 2p: 2768a078f3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615051

Bug: 224314979
Bug: 221734266
Change-Id: Id377e9ed3e293572c9f6feadbabdaa7ac66e0a6e
Merged-In: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
 2022-04-06 04:44:54 +00:00
Fraunhofer IIS FDK
2768a078f3 Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. 
Bug: 224314979
Bug: 221734266
Test: adb shell /data/fuzz/arm64/C2FuzzerAacDec/C2FuzzerAacDec /data/local/tmp/clusterfuzz-testcase-minimized-C2FuzzerAacDec-5461414938804224
Test: adb shell /data/fuzz/arm64/C2FuzzerAacDec/C2FuzzerAacDec /data/local/tmp/clusterfuzz-testcase-minimized-C2FuzzerAacDec-5062403589275648

Change-Id: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
Merged-In: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
 2022-04-06 04:44:47 +00:00
Fraunhofer IIS FDK
c650c88c62 Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. 
Bug: 224314979
Bug: 221734266
Test: adb shell /data/fuzz/arm64/C2FuzzerAacDec/C2FuzzerAacDec /data/local/tmp/clusterfuzz-testcase-minimized-C2FuzzerAacDec-5461414938804224
Test: adb shell /data/fuzz/arm64/C2FuzzerAacDec/C2FuzzerAacDec /data/local/tmp/clusterfuzz-testcase-minimized-C2FuzzerAacDec-5062403589275648

Change-Id: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
Merged-In: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
 2022-04-06 04:44:01 +00:00
Fraunhofer IIS FDK
6a3817573b Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. 
Bug: 224314979
Bug: 221734266
Test: adb shell /data/fuzz/arm64/C2FuzzerAacDec/C2FuzzerAacDec /data/local/tmp/clusterfuzz-testcase-minimized-C2FuzzerAacDec-5461414938804224
Test: adb shell /data/fuzz/arm64/C2FuzzerAacDec/C2FuzzerAacDec /data/local/tmp/clusterfuzz-testcase-minimized-C2FuzzerAacDec-5062403589275648

Change-Id: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
Merged-In: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
 2022-04-06 04:43:17 +00:00
Fraunhofer IIS FDK
eb07c22519 Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. 
Bug: 224314979
Bug: 221734266
Test: adb shell /data/fuzz/arm64/C2FuzzerAacDec/C2FuzzerAacDec /data/local/tmp/clusterfuzz-testcase-minimized-C2FuzzerAacDec-5461414938804224
Test: adb shell /data/fuzz/arm64/C2FuzzerAacDec/C2FuzzerAacDec /data/local/tmp/clusterfuzz-testcase-minimized-C2FuzzerAacDec-5062403589275648

Change-Id: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
Merged-In: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6
 2022-04-06 04:42:12 +00:00
Treehugger Robot
eafb6ae202 Merge "Add license_note" am: 3070cab376 am: 53c773b1ce am: 891e8c1f3a am: 671c4c80fe am: 7ad4d71f15 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2011744

Change-Id: Iedb8baba4e4642c671a03f27e969ad17c95a41dc
 2022-03-08 18:13:59 +00:00
Treehugger Robot
7ad4d71f15 Merge "Add license_note" am: 3070cab376 am: 53c773b1ce am: 891e8c1f3a am: 671c4c80fe 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2011744

Change-Id: Iccc75158dbd5d94658aa119cc1fff958a7688615
 2022-03-08 17:49:47 +00:00
Treehugger Robot
9d09f63dd1 Merge "Add license_note" am: 3070cab376 am: 53c773b1ce am: 891e8c1f3a am: 671c4c80fe 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2011744

Change-Id: I857e6b1572e5f408c0c65eeded59364e7c1ba52c
 2022-03-08 17:49:46 +00:00
Treehugger Robot
671c4c80fe Merge "Add license_note" am: 3070cab376 am: 53c773b1ce am: 891e8c1f3a 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2011744

Change-Id: Ia38ec1fc4507182ca045ecaacaa4e95b3ab900db
 2022-03-08 17:25:27 +00:00
Treehugger Robot
891e8c1f3a Merge "Add license_note" am: 3070cab376 am: 53c773b1ce 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2011744

Change-Id: I264e8378920565bcaa08d057cbd262e1260a5a6f
 2022-03-08 17:02:32 +00:00
Treehugger Robot
53c773b1ce Merge "Add license_note" am: 3070cab376 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2011744

Change-Id: I21f518a6f6617cb68c06fc131e38ac3c0991f28a
 2022-03-08 16:34:15 +00:00
Treehugger Robot
3070cab376 Merge "Add license_note" 2022-03-08 16:12:37 +00:00
Bob Badour
d468889147 Add license_note 
Comments not preserved during refresh.

Bug: 68860345

Test: m nothing
Change-Id: I46129df85a9242587621756be25d797bf90428d6
 2022-03-07 14:26:02 -08:00
Martin Storsjo
072f2cdafd Add Github Actions CI build testing 2022-01-10 14:14:51 +02:00
Martin Storsjo
aad97f4ec2 Revert "Avoid failing asserts on broken bitstreams" 
This reverts commit 6a2eb8b30f4a65d3b9b0422bf14eaf7007149ffd.

This issue that this commit fixed seems to have been fixed
differently upstream, by 9ed084750d72346b1533119410be9329ae138dcc.
 2022-01-10 14:11:00 +02:00
Martin Storsjo
41ae84525e Merge remote-tracking branch 'aosp/master' 2022-01-10 13:55:34 +02:00
Etienne Ruffieux
e689e65ef6 Merge "Renamed bluetooth apex name to com.android.bluetooth" am: dd6d9f9f6c am: 19aed5ca32 am: acbcc9b9f3 am: 19f5de8354 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1924424

Change-Id: If5fcd63d06db469b8da9f9e896d1c435cf7c170b
 2021-12-16 23:31:19 +00:00
Etienne Ruffieux
19f5de8354 Merge "Renamed bluetooth apex name to com.android.bluetooth" am: dd6d9f9f6c am: 19aed5ca32 am: acbcc9b9f3 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1924424

Change-Id: Iff49e44b95b4c812cfedfe4de438fa081d8dc534
 2021-12-16 23:13:53 +00:00
Etienne Ruffieux
acbcc9b9f3 Merge "Renamed bluetooth apex name to com.android.bluetooth" am: dd6d9f9f6c am: 19aed5ca32 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1924424

Change-Id: I8f89b5cf299b92478fdeea4df43dcd1544ec4a6d
 2021-12-16 22:44:25 +00:00
Etienne Ruffieux
19aed5ca32 Merge "Renamed bluetooth apex name to com.android.bluetooth" am: dd6d9f9f6c 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1924424

Change-Id: I86050beb93e24fa9fda8ad977b39429a1739316a
 2021-12-16 18:19:44 +00:00
Etienne Ruffieux
dd6d9f9f6c Merge "Renamed bluetooth apex name to com.android.bluetooth" 2021-12-16 18:10:44 +00:00
Etienne Ruffieux
71f856909f Renamed bluetooth apex name to com.android.bluetooth 
Tag: #feature
Bug: 206614050
Test: Compiles
Change-Id: I938453612da6879a1bbb68adfecaaed1d5dc0a0c
 2021-12-15 16:11:15 +00:00
Xin Li
52c48acfd3 [automerger skipped] Merge "Merge Android 12" am: 0bfa3fc1cd -s ours am: e5af18bbac -s ours am: 8174082796 -s ours am: 3a30e79d30 -s ours am: 5cc7cec66e -s ours 
am skip reason: Merged-In Ia7a8fba7d5108dd4281a47b1aa15966bb6eee947 with SHA-1 a950cd9905 is already in history

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

Change-Id: Ic6a83a0fa660a67e3a15967a6824f55156f4b8b9
 2021-10-08 09:00:04 +00:00
Xin Li
5cc7cec66e [automerger skipped] Merge "Merge Android 12" am: 0bfa3fc1cd -s ours am: e5af18bbac -s ours am: 8174082796 -s ours am: 3a30e79d30 -s ours 
am skip reason: Merged-In Ia7a8fba7d5108dd4281a47b1aa15966bb6eee947 with SHA-1 a950cd9905 is already in history

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

Change-Id: I1c15a27d8a78adbe60ecbc1732457f42e5770cfb
 2021-10-08 08:29:53 +00:00
Xin Li
3a30e79d30 [automerger skipped] Merge "Merge Android 12" am: 0bfa3fc1cd -s ours am: e5af18bbac -s ours am: 8174082796 -s ours 
am skip reason: Merged-In Ia7a8fba7d5108dd4281a47b1aa15966bb6eee947 with SHA-1 a950cd9905 is already in history

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

Change-Id: Ia3216761d230815fb591350264c8799798e718d0
 2021-10-08 07:56:55 +00:00
Xin Li
8174082796 [automerger skipped] Merge "Merge Android 12" am: 0bfa3fc1cd -s ours am: e5af18bbac -s ours 
am skip reason: Merged-In Ia7a8fba7d5108dd4281a47b1aa15966bb6eee947 with SHA-1 a950cd9905 is already in history

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

Change-Id: Idab883eab066d41db00ca29f8c7532e18de5ff06
 2021-10-08 01:39:40 +00:00
Xin Li
e5af18bbac [automerger skipped] Merge "Merge Android 12" am: 0bfa3fc1cd -s ours 
am skip reason: Merged-In Ia7a8fba7d5108dd4281a47b1aa15966bb6eee947 with SHA-1 a950cd9905 is already in history

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

Change-Id: I0a9c8548d6610f1f3d719b41c21bd40591a29673
 2021-10-08 01:20:14 +00:00
Xin Li
0bfa3fc1cd Merge "Merge Android 12" 2021-10-07 23:50:23 +00:00
Xin Li
1b5221d9fe Merge Android 12 
Bug: 202323961
Merged-In: Ia7a8fba7d5108dd4281a47b1aa15966bb6eee947
Change-Id: Iebff00b0ddec06e5d43a6f0109325613701dc05d
 2021-10-06 22:52:53 +00:00
Greg Kennedy
573e93e4d0 Update aac-enc.c 
fix typo in error messag
 2021-08-24 10:00:04 +03:00
Xin Li
c2a73571b2 [automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: a950cd9905 -s ours am: 472cef1b5e -s ours am: d327f4f001 -s ours am: fec72c2c90 -s ours 
am skip reason: Merged-In I18d2a0819145e1f02c8868674eab081ab243f0a9 with SHA-1 dcb2d8bd81 is already in history

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

Change-Id: I092764b5bf04ed177fed6883341036fdd193ce52
 2021-08-18 00:24:03 +00:00
Xin Li
fec72c2c90 [automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: a950cd9905 -s ours am: 472cef1b5e -s ours am: d327f4f001 -s ours 
am skip reason: Merged-In I18d2a0819145e1f02c8868674eab081ab243f0a9 with SHA-1 dcb2d8bd81 is already in history

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

Change-Id: Ie7bbc6582a27a2fde3560a02d1f124418fdea0c7
 2021-08-17 20:32:44 +00:00