OSDN Git Service

Merge "Remove coldboot from vold" am: cc29c526d4 am: 9a2e29fe32 am: 78bf4cbb12
authorWei Wang <wvw@google.com>
Wed, 25 Jan 2017 19:52:55 +0000 (19:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 25 Jan 2017 19:52:55 +0000 (19:52 +0000)
am: 787930f5b6

Change-Id: Id9b356819d22c23d79a576851580a1016f799ecb

1  2 
VolumeManager.cpp

Simple merge