OSDN Git Service

Merge "Fix deadlock between vold and init" am: ec58e5851d am: b957474b61 am: 3577e4c351
authorDimitry Ivanov <dimitry@google.com>
Fri, 20 Jan 2017 01:35:37 +0000 (01:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 01:35:37 +0000 (01:35 +0000)
am: 4506b67f37

Change-Id: I539b878c4d7a1372a0245ca5af5d38a846f0f667


Trivial merge