aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-02-20 11:17:33 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-02-20 11:17:33 -0800
commit5761bd24eee7399bb65b95d440799ae9d993219b (patch)
tree0af9e27b6c87a10f8dfabcdfa6de463cc84c921b
parent0de71dd7a400b837cc86db6d2c1179d5f5e7a1c6 (diff)
parent2ef1b029ce2eb95255c065cfe75f98a420c4bbdf (diff)
downloadfdk-aac-5761bd24eee7399bb65b95d440799ae9d993219b.tar.gz
fdk-aac-5761bd24eee7399bb65b95d440799ae9d993219b.tar.bz2
fdk-aac-5761bd24eee7399bb65b95d440799ae9d993219b.zip
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into master" am: d5724aefe9 -s ours am: 2dd3e2e6c9 -s ours
am: 2ef1b029ce -s ours am skip reason: subject contains skip directive Change-Id: I9f869083551264692a4efe9d94a8085ba2ace4d0
0 files changed, 0 insertions, 0 deletions