OSDN Git Service

Two phases to set the password for disk encryption am: 92c5eeb467 am: bc7cfa8fcc
authorPaul Crowley <paulcrowley@google.com>
Mon, 9 May 2016 22:11:06 +0000 (22:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 9 May 2016 22:11:06 +0000 (22:11 +0000)
am: c7e803bcc9

* commit 'c7e803bcc913e70f4cf8047e16f4f758d080c3fe':
  Two phases to set the password for disk encryption

Change-Id: I09dedebcb3dd91b0a045f1c920d43c9fc7a756cb


Trivial merge