tree 5d003a2e7a4e29d0fa3e9a5dfc16fbea928e40f8
parent 7d68f0d2748dc48096217d22d1a40e636436fac6
parent dd8fa96c017f7b3b52022cae946ae80c1d334079
author Andy Hung <hunga@google.com> 1620771926 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1620771926 +0000

Merge "AudioTrack: 24 channel index masks, compressed formats" am: e477e9686f am: dd8fa96c01

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

Change-Id: I35427c5ce3826841b1a0d313ba2488e2bc03fb3b