diff options
author | Xin Li <delphij@google.com> | 2019-09-08 15:49:32 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-09-08 15:49:32 -0700 |
commit | 99e78ac95fc13cdf0f1e4036be0faca423f4c439 (patch) | |
tree | fa62c4f58bc140ba5c0a27e2c913d3ea0a5bfe98 /libSBRenc/src/sbr_encoder.cpp | |
parent | c7d03309f91751191311d42c805ba24d30674242 (diff) | |
parent | 7fc6e3f8ff2e16ff91126ab6d74d7362a774fde7 (diff) | |
download | fdk-aac-99e78ac95fc13cdf0f1e4036be0faca423f4c439.tar.gz fdk-aac-99e78ac95fc13cdf0f1e4036be0faca423f4c439.tar.bz2 fdk-aac-99e78ac95fc13cdf0f1e4036be0faca423f4c439.zip |
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 09dc9b073f -s ours
am: 7fc6e3f8ff -s ours
am skip reason: change_id I7e02014b30f1ae5d19dbb7126ebb2a69c411fe5c with SHA1 a209adb315 is in history
Change-Id: I67e58e13c18499f1fdcd5b6b72b8afce257a22f7
Diffstat (limited to 'libSBRenc/src/sbr_encoder.cpp')
0 files changed, 0 insertions, 0 deletions