aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [automerger skipped] [automerge] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-070-0/+0
|\ | | | | | | | | | | | | | | | | | | | | transportDec_OutOfBandConfig() and skip re-allocation. 2p: 23ef1ac38c 2p: 50d66655ca am: b70aa8fe34 -s ours am: e9c55650f1 -s ours am: c5f6216db8 -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/+/17615057 Change-Id: Ib4d18a03c4f539b2883e5cc802929281c4b6ade0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * [automerger skipped] [automerge] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-060-0/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transportDec_OutOfBandConfig() and skip re-allocation. 2p: 23ef1ac38c 2p: 50d66655ca am: b70aa8fe34 -s ours am: e9c55650f1 -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/+/17615057 Change-Id: I19a6f5b72a0746783b4f462001c85f93bd9963dd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * [automerger skipped] [automerge] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-060-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transportDec_OutOfBandConfig() and skip re-allocation. 2p: 23ef1ac38c 2p: 50d66655ca am: b70aa8fe34 -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/+/17615057 Change-Id: Id45242e0af8e42ca395f63ebe58709bca23dd804 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
* | | \ [automerger skipped] [automerge] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-060-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transportDec_OutOfBandConfig() and skip re-allocation. 2p: 2768a078f3 am: d787bdd639 -s ours am: fa701f794c -s ours am: 108ef2dd74 -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: I1a39af6365623a24eb49d894c57a3ace657719b0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * \ \ \ [automerger skipped] [automerge] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-060-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transportDec_OutOfBandConfig() and skip re-allocation. 2p: 2768a078f3 am: d787bdd639 -s ours am: fa701f794c -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: I7972a6fedd4191c1f8661e62bbaa720b6265d276 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * \ \ \ [automerger skipped] [automerge] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-060-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | | * \ \ \ [automerge] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-061-1/+7
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | * | | | Reject invalid out of band config in transportDec_OutOfBandConfig() and skip ↵Fraunhofer IIS FDK2022-04-061-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | [automerger skipped] Merge changes from topic ↵Ray Essick2022-04-060-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "presubmit-am-7d8337c3813a47e19898b70f395cf7ea-git_mainline-module-media_swcodec-release-rvc-qpr-dev-sc-dev" into tm-dev am: 50b881083a -s ours am: fc4fd5e0ca -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/+/17615057 Change-Id: I221aa3d5e1c8e8aeaba6edbcf3eee6d94a24fbbb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | | | | | [automerger skipped] Merge changes from topic ↵Ray Essick2022-04-060-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "presubmit-am-7d8337c3813a47e19898b70f395cf7ea-git_mainline-module-media_swcodec-release-rvc-qpr-dev-sc-dev" into tm-dev am: 50b881083a -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/+/17615057 Change-Id: I7d2738dbb1e00ecfb22501a8b9ffd5079ad714d9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * | | | | | Merge changes from topic ↵Ray Essick2022-04-060-0/+0
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "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.
* | | | | | | | [automerger skipped] Merge changes from topic ↵Ray Essick2022-04-060-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "presubmit-am-7d8337c3813a47e19898b70f395cf7ea-git_mainline-module-media_swcodec-release-rvc-qpr-dev-sc-dev" into tm-mainline-prod am: b5da046e74 -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/+/17615057 Change-Id: I43aefcb702997e076f7087d82b7ac1ec350c5d6c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | | | | | Merge changes from topic ↵Ray Essick2022-04-060-0/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "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.
* | \ \ \ \ \ \ \ Merge changes from topic ↵Ray Essick2022-04-060-0/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "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.
| * \ \ \ \ \ \ \ \ [automerge] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-061-1/+7
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | | [automerge] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-061-1/+7
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | | | | | [automerge] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-061-1/+7
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | * \ \ \ \ \ \ [automerge] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-061-1/+7
| | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | * | | | | | | Reject invalid out of band config in transportDec_OutOfBandConfig() and skip ↵Fraunhofer IIS FDK2022-04-061-1/+7
| | | | | | |_|_|/ / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | [automerger skipped] Reject invalid out of band config in ↵Fraunhofer IIS FDK2022-04-060-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | | | | | | | Reject invalid out of band config in transportDec_OutOfBandConfig() and skip ↵Fraunhofer IIS FDK2022-04-061-1/+7
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | / | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | | | | | | | Reject invalid out of band config in transportDec_OutOfBandConfig() and skip ↵Fraunhofer IIS FDK2022-04-061-1/+7
| |/| | | | | | | | | | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | | | [automerge] Reject invalid out of band config in ↵Presubmit Automerger Backend2022-04-061-1/+7
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | / / | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | [automerge] Reject invalid out of band config in ↵Presubmit Automerger Backend2022-04-061-1/+7
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| / / / / | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | Reject invalid out of band config in transportDec_OutOfBandConfig() and skip ↵Fraunhofer IIS FDK2022-04-061-1/+7
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge "Add license_note" am: 3070cab376 am: 53c773b1ce am: 891e8c1f3a am: ↵Treehugger Robot2022-03-080-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 671c4c80fe am: 7ad4d71f15 Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2011744 Change-Id: Iedb8baba4e4642c671a03f27e969ad17c95a41dc
| * | | | | Merge "Add license_note" am: 3070cab376 am: 53c773b1ce am: 891e8c1f3a am: ↵Treehugger Robot2022-03-081-0/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 671c4c80fe Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2011744 Change-Id: Iccc75158dbd5d94658aa119cc1fff958a7688615
* | | | | | Merge "Add license_note" am: 3070cab376 am: 53c773b1ce am: 891e8c1f3a am: ↵Treehugger Robot2022-03-081-0/+4
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | | | | | | | | | | | | | | | | 671c4c80fe Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2011744 Change-Id: I857e6b1572e5f408c0c65eeded59364e7c1ba52c
| * | | / Merge "Add license_note" am: 3070cab376 am: 53c773b1ce am: 891e8c1f3aTreehugger Robot2022-03-081-0/+4
|/| | | | | | |_|/ | |/| | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2011744 Change-Id: Ia38ec1fc4507182ca045ecaacaa4e95b3ab900db
| * | | Merge "Add license_note" am: 3070cab376 am: 53c773b1ceTreehugger Robot2022-03-081-0/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2011744 Change-Id: I264e8378920565bcaa08d057cbd262e1260a5a6f
| | * | | Merge "Add license_note" am: 3070cab376Treehugger Robot2022-03-081-0/+4
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2011744 Change-Id: I21f518a6f6617cb68c06fc131e38ac3c0991f28a
| | * | | Merge "Add license_note"Treehugger Robot2022-03-081-0/+4
| |/| | |
| | * | | Add license_noteBob Badour2022-03-071-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Comments not preserved during refresh. Bug: 68860345 Test: m nothing Change-Id: I46129df85a9242587621756be25d797bf90428d6
* | | | | Merge "Renamed bluetooth apex name to com.android.bluetooth" am: dd6d9f9f6c ↵Etienne Ruffieux2021-12-161-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 19aed5ca32 am: acbcc9b9f3 am: 19f5de8354 Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1924424 Change-Id: If5fcd63d06db469b8da9f9e896d1c435cf7c170b
| * | | | Merge "Renamed bluetooth apex name to com.android.bluetooth" am: dd6d9f9f6c ↵Etienne Ruffieux2021-12-161-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 19aed5ca32 am: acbcc9b9f3 Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1924424 Change-Id: Iff49e44b95b4c812cfedfe4de438fa081d8dc534
| | * \ \ \ Merge "Renamed bluetooth apex name to com.android.bluetooth" am: dd6d9f9f6c ↵Etienne Ruffieux2021-12-161-1/+1
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 19aed5ca32 Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1924424 Change-Id: I8f89b5cf299b92478fdeea4df43dcd1544ec4a6d
| | | * | | | Merge "Renamed bluetooth apex name to com.android.bluetooth" am: dd6d9f9f6cEtienne Ruffieux2021-12-161-1/+1
| | |/| | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1924424 Change-Id: I86050beb93e24fa9fda8ad977b39429a1739316a
| | | * | | Merge "Renamed bluetooth apex name to com.android.bluetooth"Etienne Ruffieux2021-12-161-1/+1
| | |/| | |
| | | * | | Renamed bluetooth apex name to com.android.bluetoothEtienne Ruffieux2021-12-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tag: #feature Bug: 206614050 Test: Compiles Change-Id: I938453612da6879a1bbb68adfecaaed1d5dc0a0c
* | | | | | [automerger skipped] Merge "Merge Android 12" am: 0bfa3fc1cd -s ours am: ↵Xin Li2021-10-080-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | [automerger skipped] Merge "Merge Android 12" am: 0bfa3fc1cd -s ours am: ↵Xin Li2021-10-080-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | [automerger skipped] Merge "Merge Android 12" am: 0bfa3fc1cd -s ours am: ↵Xin Li2021-10-080-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * \ \ \ [automerger skipped] Merge "Merge Android 12" am: 0bfa3fc1cd -s ours am: ↵Xin Li2021-10-080-0/+0
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | * | | | [automerger skipped] Merge "Merge Android 12" am: 0bfa3fc1cd -s oursXin Li2021-10-080-0/+0
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | * | | Merge "Merge Android 12"Xin Li2021-10-0748-822/+1161
| | | | | |\ \ \
| | | | | | * | | Merge Android 12Xin Li2021-10-0648-822/+1161
| | | | | |/| | | | | | | | |/ / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 202323961 Merged-In: Ia7a8fba7d5108dd4281a47b1aa15966bb6eee947 Change-Id: Iebff00b0ddec06e5d43a6f0109325613701dc05d
* | | | | | | | [automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li2021-08-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | [automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li2021-08-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | [automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li2021-08-170-0/+0
| |/| | | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a950cd9905 -s ours am: 472cef1b5e -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: Ic2f02ed8fd742c45860ecc2989fb060233d6701c
| | * / / / / [automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li2021-08-170-0/+0
| |/| | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a950cd9905 -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: Ic566c9da8ba56244997e125548f2b643708054d1
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-28 21:58:34 +0000