tree 5b3cde841d8f5438ea91c50483f1b7f51606e9f5
parent 41514c19db4efb1e5d5d10c10d8d8e17030a113e
parent 4506b67f37a007788c442a36a7acbdcbb70f89a0
author Dimitry Ivanov <dimitry@google.com> 1484876137 +0000
committer android-build-merger <android-build-merger@google.com> 1484876137 +0000

Merge "Fix deadlock between vold and init" am: ec58e5851d am: b957474b61 am: 3577e4c351
am: 4506b67f37

Change-Id: I539b878c4d7a1372a0245ca5af5d38a846f0f667