OSDN Git Service

Two phases to set the password for disk encryption am: a363036b44 am: 8fd77a05cc
authorPaul Crowley <paulcrowley@google.com>
Wed, 18 May 2016 23:09:14 +0000 (23:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 18 May 2016 23:09:14 +0000 (23:09 +0000)
am: 59fc77e3e3

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

Change-Id: I09337fd3a410f190d7a2c0e1cf6505658d2748ed


Trivial merge