tree 88711211e303476d1c859c9e0e3ae51e00d041ab
parent f4326116945b1d7a2717eb8b2a8a7cb8f31257c7
parent 8d57302e2deaf84c039d616f6423541813b48c75
author Andy Hung <hunga@google.com> 1525136077 -0700
committer android-build-merger <android-build-merger@google.com> 1525136077 -0700

Merge "AudioPolicyManager: Ensure direct output matches exact format" into pi-dev
am: 8d57302e2d

Change-Id: I3005367e98e840800b72289565760488a47a9af2