OSDN Git Service

Revert "Two phases to set the password for disk encryption" am: d402389290
authorPaul Crowley <paulcrowley@google.com>
Tue, 10 May 2016 21:22:31 +0000 (21:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 10 May 2016 21:22:31 +0000 (21:22 +0000)
am: 26642bf7bf

* commit '26642bf7bf8f645f3d10fe0d36149d5f8b3b92fb':
  Revert "Two phases to set the password for disk encryption"

Change-Id: If0ecc2132c5012ccc9c28912170b2e91a451ac99


Trivial merge