aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2020-09-11 00:40:34 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-11 00:40:34 +0000
commit26a039634717b2cb151cc7d3c1273abceb86f5e5 (patch)
tree0e353968c34e8c9699663a9b252836b70847c30b
parent7a0dde5d5dc4d24095c0391e7fa8297de3c7cd45 (diff)
parent89b6626d5d9f5968da53d107e7f6c2666ef5400f (diff)
downloadfdk-aac-26a039634717b2cb151cc7d3c1273abceb86f5e5.tar.gz
fdk-aac-26a039634717b2cb151cc7d3c1273abceb86f5e5.tar.bz2
fdk-aac-26a039634717b2cb151cc7d3c1273abceb86f5e5.zip
[automerger skipped] Merge "Merge Android R" am: 89b6626d5d -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: I6d537ca8862ea4f0409b2f173ab9d7e9cafc70ae
0 files changed, 0 insertions, 0 deletions