tree 55618c5554aba6d3e15b1eff5b2751c12d2e12dd
parent c5186a312a3ac46beac03ad46c5a2ce2040b2f25
parent d28e890b48322f1ce64078d23df02aa01907e81a
author Jay Patel <pateljay@google.com> 1621012923 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1621012923 +0000

Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master am: d28e890b48

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317754

Change-Id: Id14a3e7743b31530a1629a4eb628360fc74ab666