mirror of https://github.com/mstorsjo/fdk-aac.git
[automerger skipped] Merge "Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE" am: f4adff7fbb
am: 0834f1a0b8
-s ours
am skip reason: Change-Id I44e842648acbceb02bbc28cf2ad729a0caddf60d with SHA-1 1f2e0ecb62
is in history
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1486978
Change-Id: Ic6a0942fdd1af69a14653a456accfd76e9361bf1
This commit is contained in:
commit
dd90d1595f