diff options
author | Xin Li <delphij@google.com> | 2019-07-09 16:14:17 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-07-09 16:14:17 -0700 |
commit | bf68b4972f7194289be7d3667eed07a81c1744fb (patch) | |
tree | fa62c4f58bc140ba5c0a27e2c913d3ea0a5bfe98 /libSBRenc | |
parent | 50d8447d975e95fc03919ddbcb66aa899abd32e4 (diff) | |
parent | 62661035192a7f66b3722d8a1fd365391a35f292 (diff) | |
download | fdk-aac-bf68b4972f7194289be7d3667eed07a81c1744fb.tar.gz fdk-aac-bf68b4972f7194289be7d3667eed07a81c1744fb.tar.bz2 fdk-aac-bf68b4972f7194289be7d3667eed07a81c1744fb.zip |
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master" am: c2eb64586d -s ours
am: 6266103519 -s ours
am skip reason: subject contains skip directive
Change-Id: I69945c03e154530e7d917f1de7f0669480715686
Diffstat (limited to 'libSBRenc')
0 files changed, 0 insertions, 0 deletions