diff options
| author | Xin Li <delphij@google.com> | 2022-06-17 00:15:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-06-17 00:15:36 +0000 |
| commit | 1a013376bdec4115a2f6bf10ec50cb253a39f584 (patch) | |
| tree | 825f49297082c523f9e16a17f9ec399b7e35eee5 /Android.bp | |
| parent | 3d2637ce9a7f22783f5d3fdbfb2af33832e95ecc (diff) | |
| parent | 5ccfd6ac786bd159d5f9976918b5d1f9078edff9 (diff) | |
| download | fdk-aac-1a013376bdec4115a2f6bf10ec50cb253a39f584.tar.gz fdk-aac-1a013376bdec4115a2f6bf10ec50cb253a39f584.tar.bz2 fdk-aac-1a013376bdec4115a2f6bf10ec50cb253a39f584.zip | |
[automerger skipped] Merge "Merge Android 12 QPR 3" am: cb00f5235d -s ours am: 5ccfd6ac78 -s ours
am skip reason: Merged-In I4df938df7886adc58185586190e27bcd16e17966 with SHA-1 1f830f7196 is already in history
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2126004
Change-Id: Ic35150ce86342d8abe9bfc0f77c0b255c3ec7d42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'Android.bp')
0 files changed, 0 insertions, 0 deletions