| commit | 8d5165ab0fbf0dcf3e639bb1dbdc11ed6c152f8b | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Tue May 10 21:22:36 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue May 10 21:22:36 2016 +0000 |
| tree | 7ba95b4524e264f23f9445197c5f6015c3f185bd | |
| parent | 6a87b09b32adc739b524002354b21bf235ff2153 [diff] | |
| parent | aa79651bcdd21446d57bb889ca7f0c091a43852d [diff] |
Merge "Revert "Two phases to set the password for disk encryption" am: d402389290 am: 26642bf7bf" into nyc-mr1-dev-plus-aosp