mirror of https://github.com/mstorsjo/fdk-aac.git
[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 7ea2e46dc1
am: 13d520b193
-s ours
am skip reason: subject contains skip directive
Change-Id: Ic14cc4914dfb877a04b150b63f8cb1f10a9646c7
This commit is contained in:
commit
77e652f766