aboutsummaryrefslogtreecommitdiffstats
path: root/libSACenc
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2021-08-18 00:24:03 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-08-18 00:24:03 +0000
commitc2a73571b2b6dcf73683a85cd8fc0a4e3948be7b (patch)
treec6a1ddee22e29d9ea00ec2523071a711368189cd /libSACenc
parent6f8272c3943db88ec6d9ad3d2cc6e8be729b2d35 (diff)
parentfec72c2c90577113522ef7667afdb13ed4988fb3 (diff)
downloadfdk-aac-c2a73571b2b6dcf73683a85cd8fc0a4e3948be7b.tar.gz
fdk-aac-c2a73571b2b6dcf73683a85cd8fc0a4e3948be7b.tar.bz2
fdk-aac-c2a73571b2b6dcf73683a85cd8fc0a4e3948be7b.zip
[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: a950cd9905 -s ours am: 472cef1b5e -s ours am: d327f4f001 -s ours am: fec72c2c90 -s ours
am skip reason: Merged-In I18d2a0819145e1f02c8868674eab081ab243f0a9 with SHA-1 dcb2d8bd81 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/15567335 Change-Id: I092764b5bf04ed177fed6883341036fdd193ce52
Diffstat (limited to 'libSACenc')
0 files changed, 0 insertions, 0 deletions