| commit | 2958c016a1921f730e1a277b3e6e544788bb5810 | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Tue Sep 16 08:59:29 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 16 08:59:29 2014 +0000 |
| tree | 314808585da20b541329e2fdba67de60be38ec31 | |
| parent | 810d34a4a1148c4c9fb3255aee0fb774feba3884 [diff] | |
| parent | 006d1bc4ed690f48f5d39e6a8efafacb3b356c13 [diff] |
am 3b36b8c7: am 1416621b: Merge "Show the lockscreen when more than 1 user is present" into lmp-dev * commit '3b36b8c7d91dc8793429491617c645c1aafc4d49': Show the lockscreen when more than 1 user is present