tree 4c739ed750872366352d946f0fb8982574097ebd
parent 5fea9dfd6ca568c9b3e600b6e77a1ad1883e5cb7
parent 0f97d8f4957a66dd8fb776340e11e1b3e151ac1d
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1516748717 +0000
committer android-build-merger <android-build-merger@google.com> 1516748717 +0000

Merge "Audio policy config: allow vendor to extend module name am: eb488fad65  -s ours am: 6834a7bea7  -s ours" into oc-mr1-dev
am: 0f97d8f495  -s ours

Change-Id: Ie3d222f694f3a0ba097fb8674f34e2bd6fc24140