aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2018-12-13 12:13:40 -0800
committerandroid-build-merger <android-build-merger@google.com>2018-12-13 12:13:40 -0800
commitc08ee65450a2bf52ffc09d6317c25626b3b81173 (patch)
tree37a1b26326e4949a075314bf37e9d604552fba04
parent2373e71ff8e3f113d7879f282572ae3722b7ac04 (diff)
parent1fdfa469a6fabc2118f5ad1b5025fd51f92ad303 (diff)
downloadfdk-aac-c08ee65450a2bf52ffc09d6317c25626b3b81173.tar.gz
fdk-aac-c08ee65450a2bf52ffc09d6317c25626b3b81173.tar.bz2
fdk-aac-c08ee65450a2bf52ffc09d6317c25626b3b81173.zip
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: 20c336953f -s ours
am: 1fdfa469a6 -s ours Change-Id: I4224085df6dd07c11fcc0caa42ae1e2e40d8a05e
0 files changed, 0 insertions, 0 deletions