mirror of
https://github.com/mstorsjo/fdk-aac.git
synced 2025-01-09 14:13:50 +01:00
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am:09dc9b073f
-s ours am skip reason: change_id I7e02014b30f1ae5d19dbb7126ebb2a69c411fe5c with SHA1a209adb315
is in history Change-Id: I921ce87ed814fc4b8ff3977e3b5fefa796e872f2
This commit is contained in:
commit
7fc6e3f8ff