tree 1e8d014747cd93338c9e0403abddbae6b48fb464
parent 09f60e265ff060e481ee2859ea589217cfb5b431
parent 7a73cf02afd58e5e9e9fecc6842cd1489b830f87
author Marco Nelissen <marcone@google.com> 1478541633 +0000
committer android-build-merger <android-build-merger@google.com> 1478541633 +0000

Merge "IAudioPolicyService is now in libaudioclient instead of libmedia" am: 76f97250ff am: c58a77360c am: ff3b15b22e
am: 7a73cf02af

Change-Id: Ib5c3c7d3a527e47051d795be4a26e30f525c989a