aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-07-09 15:53:24 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-07-09 15:53:24 -0700
commit50d8447d975e95fc03919ddbcb66aa899abd32e4 (patch)
treefa62c4f58bc140ba5c0a27e2c913d3ea0a5bfe98
parent4d56b880e2d129757bd0855859da83cad0399965 (diff)
parent506ae97beeb7b27a9456914dd258cdbe70ae54fe (diff)
downloadfdk-aac-50d8447d975e95fc03919ddbcb66aa899abd32e4.tar.gz
fdk-aac-50d8447d975e95fc03919ddbcb66aa899abd32e4.tar.bz2
fdk-aac-50d8447d975e95fc03919ddbcb66aa899abd32e4.zip
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master am: 569027011c -s ours
am: 506ae97bee -s ours am skip reason: subject contains skip directive Change-Id: I715b40974bbd1381f7b72c0ee399fe4214444a0d
0 files changed, 0 insertions, 0 deletions