| commit | 3a30e79d30d56f3e3bd0ac6f2ae7254d89f6b77c | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 08 07:56:55 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 07:56:55 2021 +0000 |
| tree | c6a1ddee22e29d9ea00ec2523071a711368189cd | |
| parent | d327f4f00195d423c9b951be4e624cf3729ef251 [diff] | |
| parent | 8174082796ca4d795025c6ccc2f1ee88de3efc0e [diff] |
[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