| commit | ec717def3496007b29bfdd926f4c9c2416c9cd05 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 03:33:44 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:33:44 2020 +0000 |
| tree | 53705cee093f9ffd9699c4b1b8d07e546717d9ae | |
| parent | 7b0e1e7056f466386c96b2150708e7d0c5e94448 [diff] | |
| parent | c0dbde6b3336d2dbd2f6d67d332ecb7a2b62fa70 [diff] |
[automerger skipped] Merge "Merge Android R" am: 89b6626d5d -s ours am: 26a0396347 -s ours am: c0dbde6b33 -s ours am skip reason: Change-Id Idcdb13a8c37b0b4b5446169c3e80dfe55586bc77 with SHA-1 7a0dde5d5d is in history Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1421866 Change-Id: I5b8161f44651f40c168a81ba535e8c26ad5b533e