commit | 006d1bc4ed690f48f5d39e6a8efafacb3b356c13 | [log] [tgz] |
---|---|---|
author | Adam Lesinski <adamlesinski@google.com> | Tue Sep 16 08:42:12 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 16 08:42:12 2014 +0000 |
tree | b1ed4546073f57f31e6f0398a089880788c4e61f | |
parent | 667a73f860cd8037920ea8cc37fe50d8bd6cc8cc [diff] | |
parent | 3846c1d2611aa0fc4c6b86df988444494cfad268 [diff] |
am 1416621b: Merge "Show the lockscreen when more than 1 user is present" into lmp-dev * commit '1416621b4407fe8a1b488cface2be5743fa4b7a3': Show the lockscreen when more than 1 user is present