diff options
| author | Xin Li <delphij@google.com> | 2022-06-17 20:52:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-06-17 20:52:43 +0000 |
| commit | f7594a4c7396e97f21801d9aca842686658ffd76 (patch) | |
| tree | 825f49297082c523f9e16a17f9ec399b7e35eee5 /libAACdec/src/usacdec_ace_d4t64.cpp | |
| parent | 2c16a17358fb7c0d6365138e27a62913f9fa2c1a (diff) | |
| parent | 9eb437d8ca6b074e65917be144a87af092584976 (diff) | |
| download | fdk-aac-f7594a4c7396e97f21801d9aca842686658ffd76.tar.gz fdk-aac-f7594a4c7396e97f21801d9aca842686658ffd76.tar.bz2 fdk-aac-f7594a4c7396e97f21801d9aca842686658ffd76.zip | |
[automerger skipped] Merge Android 12 QPR 3 am: 0ace73f2d3 -s ours am: 3c9fe29541 -s ours am: 3d2637ce9a -s ours am: 9eb437d8ca -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: Ife4349f0a7ab64120e0bb4fba0c6e1b72465ad49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libAACdec/src/usacdec_ace_d4t64.cpp')
0 files changed, 0 insertions, 0 deletions