mirror of https://github.com/mstorsjo/fdk-aac.git
[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: d929f68a05
-s ours
am: 5d3d55e2c7
Change-Id: I0ada3904a4004089fdfdb43966288c019cf58d8c
This commit is contained in:
commit
35b1ada3b4