| commit | a222880e9bc4045690533047965546cb80adc9dd | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 03:59:15 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:59:15 2020 +0000 |
| tree | 53705cee093f9ffd9699c4b1b8d07e546717d9ae | |
| parent | 543db9d0bd18656bc74b87e515f284d1b0ebe498 [diff] | |
| parent | ec717def3496007b29bfdd926f4c9c2416c9cd05 [diff] |
[automerger skipped] Merge "Merge Android R" am: 89b6626d5d -s ours am: 26a0396347 -s ours am: c0dbde6b33 -s ours am: ec717def34 -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: I33abaa1c2d16e2b0b93b33e942c1e315fd1f29aa