tree b8f546fa26db7caf8913e171682ae7adc938739c
parent 967f9715c3bda8e2e3ec01d412b4220b8927bcef
parent cc29c526d4987c502d1c897cd0a275b973c2e7ce
author Wei Wang <wvw@google.com> 1485373553 +0000
committer android-build-merger <android-build-merger@google.com> 1485373553 +0000

Merge "Remove coldboot from vold"
am: cc29c526d4

Change-Id: I3de54db5f27692ab47ddf047ede056c536424438