tree 94aececa480adcdf54ff920518dd8d6a98480aac
parent 192fbf937a379652f8b5c1ba40caf4e0ba78f4c4
parent d0a4a2329714c28ebb84ff717969efd0f54706d3
author Jean-Michel Trivi <jmtrivi@google.com> 1592490649 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1592490649 +0000

Merge "AAC decoder: fix KEY_AAC_MAX_OUTPUT_CHANNEL_COUNT" into rvc-dev am: 7f21c552d2 am: d0a4a23297

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

Change-Id: I0dca60c78e9d7785dcd0fe286f44476c6bd3d6a7