mirror of
https://github.com/mstorsjo/fdk-aac.git
synced 2025-02-08 15:48:43 +01:00
[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 7a0dde5d5d -s ours am: 389ba21eed -s ours am: 016718d3fd -s ours am: 3f82e7e794 -s ours
am skip reason: Change-Id I9bd31724ae68b9a0b3eb4bb5be3782359824aa1f with SHA-1 e0624f4c05 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12470067 Change-Id: I4b098981a68a33cdb6a20a08481cea8d8d8f09fa
This commit is contained in:
commit
4c5e147475