| commit | 017d8647ab225089361219fae3ac7e86204b9736 | [log] [tgz] |
|---|---|---|
| author | Paul Crowley <paulcrowley@google.com> | Mon May 09 21:49:54 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon May 09 21:49:54 2016 +0000 |
| tree | 8729382822d58480d9ff2e693e8c8359fa2c9f63 | |
| parent | 87704f68614eefb5f475baa7831785eadf6aacd1 [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: Ic77d5608961b34993848fc71809a27001d919abc