tree 065deb222261c27abeb6129216e4eb72a170485f
parent fd9349f3adbeba73f4e46d84f31776896eab5839
parent 821a65113df7d77f6977b4710bb02bb19f361516
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1516748279 +0000
committer android-build-merger <android-build-merger@google.com> 1516748279 +0000

Merge "Allow partially dynamic profile in the audio policy config am: e54b381d9d  -s ours am: 615a9a5925  -s ours" into oc-mr1-dev am: d92e09a589  -s ours
am: 821a65113d  -s ours

Change-Id: I6572eaf7437cfc1625d8f1aecadab67c7c6fba9e