OSDN Git Service

Merge "Two phases to set the password for disk encryption" into nyc-dev
authorPaul Crowley <paulcrowley@google.com>
Mon, 9 May 2016 21:49:54 +0000 (21:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 9 May 2016 21:49:54 +0000 (21:49 +0000)
commit017d8647ab225089361219fae3ac7e86204b9736
tree8729382822d58480d9ff2e693e8c8359fa2c9f63
parent87704f68614eefb5f475baa7831785eadf6aacd1
parent9aa6bb5a4a8bd00a175e8a9c338b52bc24a162b4
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