OSDN Git Service

Merge "Do not tie managed profile synchronously in onUnlockUser()" into nyc-dev
authorRicky Wai <rickywai@google.com>
Wed, 25 May 2016 13:04:31 +0000 (13:04 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 25 May 2016 13:04:32 +0000 (13:04 +0000)
commit99df649aa4907d9f9c6fe4bdf4acb517003f97f2
treeee2f91c7c88985fc4e82a4abb7a2817e158e495c
parent50c33d1ca1218ec00eb37f66a7c11315603c9ef7
parentb0cdf3845fd33cc40a929a2b9b882bf0a3a994d3
Merge "Do not tie managed profile synchronously in onUnlockUser()" into nyc-dev
services/core/java/com/android/server/LockSettingsService.java