mirror of https://github.com/mstorsjo/fdk-aac.git
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master am: 569027011c
-s ours am: 506ae97bee
-s ours am: 50d8447d97
am: 2480568f89
-s ours
am skip reason: subject contains skip directive
Change-Id: I78e6e4e8878c1b48c2dbeb2fdc48f48e7926e9a3
This commit is contained in:
commit
c6a0d0f4c2