OSDN Git Service

Merge "Revert "Two phases to set the password for disk encryption"" into nyc-dev
authorPaul Crowley <paulcrowley@google.com>
Tue, 10 May 2016 21:07:57 +0000 (21:07 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 10 May 2016 21:07:59 +0000 (21:07 +0000)
commitf829c1463b4805545d15924ad6243b9405eb83d6
tree4dacf600f5b01545dd73e3401b2492740c928f4e
parentdc5f558640da8785fabc274167ec37a0fda30cd6
parenta1eb750e75ff7c7ef7698deed4442449c33334c8
Merge "Revert "Two phases to set the password for disk encryption"" into nyc-dev
services/core/java/com/android/server/LockSettingsService.java