commit | d365ddbd736729415df5a9b5823e74ad87ac2380 | [log] [tgz] |
---|---|---|
author | Paul Crowley <paulcrowley@google.com> | Mon May 09 21:50:20 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon May 09 21:50:20 2016 +0000 |
tree | 457777c6c07338dd8edb71bfb665e26ba250be41 | |
parent | 3f8315a923aea0b57f1c086b0bf02d891745a196 [diff] | |
parent | 9aa6bb5a4a8bd00a175e8a9c338b52bc24a162b4 [diff] |
Merge "Two phases to set the password for disk encryption" into nyc-dev am: 9aa6bb5a4a * commit '9aa6bb5a4a8bd00a175e8a9c338b52bc24a162b4': Two phases to set the password for disk encryption Change-Id: Ic8102ebd218f387236aa5ef013ccdf4bc8f58ce1