| commit | 8174082796ca4d795025c6ccc2f1ee88de3efc0e | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 08 01:39:40 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 01:39:40 2021 +0000 |
| tree | c6a1ddee22e29d9ea00ec2523071a711368189cd | |
| parent | 472cef1b5e8ea8f1e60882835b0e367ac7453455 [diff] | |
| parent | e5af18bbacd89e710087f3c372b844a61bfe8795 [diff] |
[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