aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2020-09-11 21:27:44 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-11 21:27:44 +0000
commit7dc94b2dfa964385869bc2e4acfc1d509e9a3aea (patch)
tree53705cee093f9ffd9699c4b1b8d07e546717d9ae
parent7d2846db6497c5abefcbb3ff17783ecd07ab102d (diff)
parenta222880e9bc4045690533047965546cb80adc9dd (diff)
downloadfdk-aac-7dc94b2dfa964385869bc2e4acfc1d509e9a3aea.tar.gz
fdk-aac-7dc94b2dfa964385869bc2e4acfc1d509e9a3aea.tar.bz2
fdk-aac-7dc94b2dfa964385869bc2e4acfc1d509e9a3aea.zip
[automerger skipped] Merge "Merge Android R" am: 89b6626d5d -s ours am: 26a0396347 -s ours am: c0dbde6b33 -s ours am: ec717def34 -s ours am: a222880e9b -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: Idea157a42c7031cfa30de0dd3b1f50dac3b46583
0 files changed, 0 insertions, 0 deletions