tree ad659e9cf5a10aa3b76ffabd2e28b407ab8f814a
parent 8da63cc36962526ed086cb693685c970a8cbe3f0
parent 61d553f22450692897fd5bdc67eb014702a8996b
author Eric Laurent <elaurent@google.com> 1540419333 -0700
committer android-build-merger <android-build-merger@google.com> 1540419333 -0700

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

Change-Id: Ic91d3495a7979750101b460814bcde5b7b0c48a5