diff options
author | Xin Li <delphij@google.com> | 2022-04-20 06:17:10 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-20 06:17:10 +0000 |
commit | 30772487bf9a870f8f5bb240766ff138c8f285d8 (patch) | |
tree | 825f49297082c523f9e16a17f9ec399b7e35eee5 /libSACenc/src/sacenc_lib.cpp | |
parent | 867aec820584dc2fe1fde8c3428a78e366651b95 (diff) | |
parent | 2c16a17358fb7c0d6365138e27a62913f9fa2c1a (diff) | |
download | fdk-aac-30772487bf9a870f8f5bb240766ff138c8f285d8.tar.gz fdk-aac-30772487bf9a870f8f5bb240766ff138c8f285d8.tar.bz2 fdk-aac-30772487bf9a870f8f5bb240766ff138c8f285d8.zip |
[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: 1f830f7196 -s ours am: 456ba9e186 -s ours am: 9192d46a8a -s ours am: 7e1fb037c7 -s ours am: 2c16a17358 -s ours
am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 23ef1ac38c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17805627
Change-Id: Ia644755696ea531375453e840f4c605e85b80246
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libSACenc/src/sacenc_lib.cpp')
0 files changed, 0 insertions, 0 deletions