mirror of https://github.com/mstorsjo/fdk-aac.git
[automerger skipped] Merge Android U (ab/10368041) am: ff7af5c8e6
-s ours am: 5a494cb19d
-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: Ibb561b2cd05103b265e643d3cf0cb02846546f53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
2c67e4be56