tree 8293fe5f2d24c85aa5a45694cddef0b18df50dc8
parent 23e8eadca93881e8617cd344ae50e70113fdc617
parent cbcaabedfd54ae034635bbe2ec220f8f2b540fa6
author Eric Laurent <elaurent@google.com> 1540237022 -0700
committer android-build-merger <android-build-merger@google.com> 1540237022 -0700

Merge "Fixed unsafe lock upon safe media volume"
am: cbcaabedfd

Change-Id: Ic015a148011a1bf12cb8457ec56db8991747f8e2