tree d71bf934b020ed2c701507bcf1adaa8c29ef2dd9
parent 5784987368501df52ba49b4ae0325a68737ccefc
parent 0dc58adb480ec48fafad5779223b6f16bb1af6dc
author Jean-Michel Trivi <jmtrivi@google.com> 1592492857 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1592492857 +0000

Merge "AAC decoder: fix KEY_AAC_MAX_OUTPUT_CHANNEL_COUNT" into rvc-dev am: 7f21c552d2 am: d0a4a23297 am: 8236dc3abc am: 0dc58adb48

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/11827369

Change-Id: I822c4eb019272856ca5b8047a3d0634e112664cd