mirror of https://github.com/mstorsjo/fdk-aac.git
[automerger skipped] Merge Android U (ab/10368041) am: ff7af5c8e6
-s ours
am skip reason: Merged-In Icf5305a7da47fb85235f428151f2fed10f4aa2f4 with SHA-1 820482ff3f
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/24181617
Change-Id: I581dd4e3327870449926487ed3d04d22f2c8cbde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
5a494cb19d