aboutsummaryrefslogtreecommitdiffstats
path: root/Android.bp
diff options
context:
space:
mode:
authorBill Yi <byi@google.com>2020-11-05 04:21:02 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-11-05 04:21:02 +0000
commit700bc783fb57d88d8aaa74ea84778b0f1c6be128 (patch)
tree53705cee093f9ffd9699c4b1b8d07e546717d9ae /Android.bp
parent092c1fb7fbbd7550dcd9f5c68bbf91384364c754 (diff)
parent51ff3aa199cf39cd25c741bc65a93324f1d12d76 (diff)
downloadfdk-aac-700bc783fb57d88d8aaa74ea84778b0f1c6be128.tar.gz
fdk-aac-700bc783fb57d88d8aaa74ea84778b0f1c6be128.tar.bz2
fdk-aac-700bc783fb57d88d8aaa74ea84778b0f1c6be128.zip
[automerger skipped] Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE am: 5b4265a02a am: 8b4e287ff6 -s ours am: 51ff3aa199 -s ours
am skip reason: Change-Id I44e842648acbceb02bbc28cf2ad729a0caddf60d with SHA-1 1f2e0ecb62 is in history Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1486978 Change-Id: Ifc66ac802e4e6eec723e5e762cf94f107f5f7ba6
Diffstat (limited to 'Android.bp')
0 files changed, 0 insertions, 0 deletions