aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-02-20 10:05:48 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-02-20 10:05:48 -0800
commit2ef1b029ce2eb95255c065cfe75f98a420c4bbdf (patch)
treea7dcb32bd00be5b642f57235267938e0dbffb0e3
parent9d138bd1e37efcf91c221d3a548b00db4de7c577 (diff)
parent2dd3e2e6c93425c88c6a6457ace51fe7fd6439b1 (diff)
downloadfdk-aac-2ef1b029ce2eb95255c065cfe75f98a420c4bbdf.tar.gz
fdk-aac-2ef1b029ce2eb95255c065cfe75f98a420c4bbdf.tar.bz2
fdk-aac-2ef1b029ce2eb95255c065cfe75f98a420c4bbdf.zip
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into master" am: d5724aefe9 -s ours
am: 2dd3e2e6c9 -s ours am skip reason: subject contains skip directive Change-Id: I33bcb484a7e06e1f38cbd7dc9e25faccdc7feede
0 files changed, 0 insertions, 0 deletions