tree 4c739ed750872366352d946f0fb8982574097ebd
parent 7a76e466c7434979087f12f66877f7cfb667446f
parent e6307ffb71e7793e96bae9f76b12892b1ead3ece
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1516755360 +0000
committer android-build-merger <android-build-merger@google.com> 1516755360 +0000

[automerger] Audio policy config: Device port (type,address) must be unique am: 117188b315  -s ours am: 805062aa31 am: 51c2c54392
am: e6307ffb71

Change-Id: I8a55c1ec80455dc48ebfd29fae88bac5cb6cf5de