mirror of https://github.com/mstorsjo/fdk-aac.git
[automerger skipped] Merge rvc-release RP1A.201105.002 to stage-aosp-master - DO NOT MERGE am: 4c3407e563
-s ours
am skip reason: Change-Id I31fe9fe1e8dd7e919848be94dd73dfb779e7065d with SHA-1 aacea3ffc5
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12984835
Change-Id: I44e842648acbceb02bbc28cf2ad729a0caddf60d
This commit is contained in:
commit
1f2e0ecb62