OSDN Git Service

am 7ef87d4d: am 0a4e461e: Hidden global setting to allow adding users from lockscreen
authorAmith Yamasani <yamasani@google.com>
Sat, 26 Jul 2014 01:06:32 +0000 (01:06 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 26 Jul 2014 01:06:32 +0000 (01:06 +0000)
* commit '7ef87d4de0975ed682c50e5c14f7e58c1ce9622a':
  Hidden global setting to allow adding users from lockscreen


Trivial merge