mirror of https://github.com/mstorsjo/fdk-aac.git
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 4d56b880e2
am: 0942f837c5
-s ours
am skip reason: subject contains skip directive
Change-Id: Ia49c4c0c1b61b95d4393f7312189c237d86e5ea2
This commit is contained in:
commit
916e0784d6