OSDN Git Service

Merge "Revert "Two phases to set the password for disk encryption" am: d402389290...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Tue, 10 May 2016 21:22:36 +0000 (21:22 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 10 May 2016 21:22:36 +0000 (21:22 +0000)
commit8d5165ab0fbf0dcf3e639bb1dbdc11ed6c152f8b
tree7ba95b4524e264f23f9445197c5f6015c3f185bd
parent6a87b09b32adc739b524002354b21bf235ff2153
parentaa79651bcdd21446d57bb889ca7f0c091a43852d
Merge "Revert "Two phases to set the password for disk encryption" am: d402389290 am: 26642bf7bf" into nyc-mr1-dev-plus-aosp