tree df60e51f5187dd54165c36957981a518c3243e0e
parent f042abe8f43788b7ed6fd2e681a1979c5160f10b
parent 5dbd36d6c27e142b7cbb365731eaff677e3af580
author Eric Laurent <elaurent@google.com> 1499831684 +0000
committer android-build-merger <android-build-merger@google.com> 1499831684 +0000

Merge "audioservice: fix media volume reset at boot" into oc-dr1-dev am: 09a93b9739
am: 5dbd36d6c2

Change-Id: Id3cffa56e203092a720f2ec34a6304880b83020a