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:35:33 +0000 (21:35 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 9 May 2016 21:35:34 +0000 (21:35 +0000)

Trivial merge