aboutsummaryrefslogtreecommitdiffstats
path: root/libAACdec
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-10-30 14:42:53 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-10-30 14:42:53 -0700
commit77e652f76694102b9c6499d5a2209ca0bf44e0c3 (patch)
treefa7778872b05e66a9aeddce2a0fc1d7deab8c770 /libAACdec
parentfc8faa38d90380adfb61b2b280a36c73369c9aff (diff)
parent13d520b193266a610f5ca6b07b0c0f039ddb21b5 (diff)
downloadfdk-aac-77e652f76694102b9c6499d5a2209ca0bf44e0c3.tar.gz
fdk-aac-77e652f76694102b9c6499d5a2209ca0bf44e0c3.tar.bz2
fdk-aac-77e652f76694102b9c6499d5a2209ca0bf44e0c3.zip
[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 7ea2e46dc1
am: 13d520b193 -s ours am skip reason: subject contains skip directive Change-Id: Ic14cc4914dfb877a04b150b63f8cb1f10a9646c7
Diffstat (limited to 'libAACdec')
0 files changed, 0 insertions, 0 deletions