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 skip reason: subject contains skip directive
Change-Id: I5aecc5cecde457bbfa6a076c68bd0b14bfa5da3f
This commit is contained in:
commit
506ae97bee