aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-02-20 08:40:25 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-02-20 08:40:25 -0800
commitb3537f907a5408d46452bf092c35bfff0575f367 (patch)
treea7dcb32bd00be5b642f57235267938e0dbffb0e3
parent8e6b62378b1baded1afc5f0c30bd72c81170e456 (diff)
parent7ac13ae4aaac5c67143f5f797f8506563747b998 (diff)
downloadfdk-aac-b3537f907a5408d46452bf092c35bfff0575f367.tar.gz
fdk-aac-b3537f907a5408d46452bf092c35bfff0575f367.tar.bz2
fdk-aac-b3537f907a5408d46452bf092c35bfff0575f367.zip
[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master
am: 7ac13ae4aa -s ours am skip reason: subject contains skip directive Change-Id: Iadf52d35e2cf2a963d0a9b78cbcf7a8320d3b27d
0 files changed, 0 insertions, 0 deletions