commit | cb4ef1b58bbcea27888831f22d00021d51df1ee1 | [log] [tgz] |
---|---|---|
author | Paul Crowley <paulcrowley@google.com> | Tue May 10 21:25:31 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue May 10 21:25:31 2016 +0000 |
tree | 66114cad9f32c046b03f47738a6b46c03b110820 | |
parent | fde5c3dd0bdff836cbc13a67f08f98f9754e6f49 [diff] | |
parent | 8d5165ab0fbf0dcf3e639bb1dbdc11ed6c152f8b [diff] |
Merge "Revert "Two phases to set the password for disk encryption" am: d402389290 am: 26642bf7bf" into nyc-mr1-dev-plus-aosp am: 8d5165ab0f * commit '8d5165ab0fbf0dcf3e639bb1dbdc11ed6c152f8b': Change-Id: I412b2816fb1fcf4fbefc9a72c8d6852a79d1eace