tree b1e4ea4bcec03a97a01ab08c4bda5abd44e9dafd
parent c1323664d46a502da8f8a4f5ca50f697a9eb1bd4
parent 051285b648351bddbda6736c2524df1f96c84560
author Jean-Michel Trivi <jmtrivi@google.com> 1498620783 +0000
committer android-build-merger <android-build-merger@google.com> 1498620783 +0000

Merge "AudioService: internal API for disabling audio playback for a UID" into oc-dr1-dev am: 8f81919093
am: 051285b648

Change-Id: Ib78281b6bc1b4ae37e0aba5e6a0b20cd81a29db2