| commit | 5bf7800de6d14a55d0c6ee006425fa79c3f8d21e | [log] [tgz] |
|---|---|---|
| author | Amith Yamasani <yamasani@google.com> | Mon Sep 10 18:12:42 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Sep 10 18:12:42 2012 -0700 |
| tree | d8fa7bb5ae290d714c2e3e4b8fc117d8f45696c9 | |
| parent | df46c637550b4c6f0543574cfbd544329f48f5c7 [diff] | |
| parent | b70ff9a181234ffb69e51db2148ed865eb3a6ca7 [diff] |
Merge "Force keyguard if there are multiple users" into jb-mr1-dev