aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2020-09-11 02:02:53 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-11 02:02:53 +0000
commitc0dbde6b3336d2dbd2f6d67d332ecb7a2b62fa70 (patch)
tree53705cee093f9ffd9699c4b1b8d07e546717d9ae
parent846f899a2f878ec84d0b3f3c525e99d5ad514039 (diff)
parent26a039634717b2cb151cc7d3c1273abceb86f5e5 (diff)
downloadfdk-aac-c0dbde6b3336d2dbd2f6d67d332ecb7a2b62fa70.tar.gz
fdk-aac-c0dbde6b3336d2dbd2f6d67d332ecb7a2b62fa70.tar.bz2
fdk-aac-c0dbde6b3336d2dbd2f6d67d332ecb7a2b62fa70.zip
[automerger skipped] Merge "Merge Android R" am: 89b6626d5d -s ours am: 26a0396347 -s ours
am skip reason: Change-Id Idcdb13a8c37b0b4b5446169c3e80dfe55586bc77 with SHA-1 7a0dde5d5d is in history Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1421866 Change-Id: I1713993ae0e8fb75c4e27fdad6c8e263b7391a03
0 files changed, 0 insertions, 0 deletions