OSDN Git Service

Merge "New api in LockSettingsService to get StrongAuth synchronously" into nyc-dev
authorVictor Chang <vichang@google.com>
Mon, 23 May 2016 11:51:54 +0000 (11:51 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 23 May 2016 11:51:56 +0000 (11:51 +0000)
commitd86ac8116bfc64c61d8124ff8d3e92be5e55cd3e
tree421956e05889d3b33514d6a0e42a4dda0e46cb14
parentcb988096570de8af4883ae3bdea06c88f8fd235a
parenta0940d33dcbac0245ad5467d9c302f8eaee615dc
Merge "New api in LockSettingsService to get StrongAuth synchronously" into nyc-dev
services/core/java/com/android/server/LockSettingsService.java