mirror of https://github.com/mstorsjo/fdk-aac.git
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 09dc9b073f
-s ours am: 7fc6e3f8ff
-s ours
am:99e78ac95f
-s ours am skip reason: change_id I7e02014b30f1ae5d19dbb7126ebb2a69c411fe5c with SHA1a209adb315
is in history Change-Id: I1b0e74e7c405aa4e9b9841cc9ad931561ab5df56
This commit is contained in:
commit
17bc55672e