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: dd90d1595f
-s ours am: de35b0d3cc
-s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1486978 Change-Id: I01e518ed4a6d04fd21c673bd6fbf7c6739d21320
This commit is contained in:
commit
95d83d6c0d