mirror of
https://github.com/mstorsjo/fdk-aac.git
synced 2025-06-05 22:39:13 +02:00
[automerger skipped] Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE am: 5b4265a02a
am: 8b4e287ff6
-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: Ia3fae7d8939333684ff3ea15081ac69624d58873
This commit is contained in: