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

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

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

Change-Id: I66b64d7101365185add4dbffefa4df95a787eaae