| commit | c354b89c761149ee0d3393f4f388e8416f52e963 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Mon Jun 07 19:24:45 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jun 07 19:24:45 2010 -0700 |
| tree | dc7a2376d1b713062dfe2e22081241f7ed455b70 | |
| parent | e1855846a47e02b129acf978ec102cdd3d8b74f7 [diff] | |
| parent | 7188d6887e6d7a5d1dc86c77aeeec33c4ffc6568 [diff] |
Merge "Fix 2737842: disable keyguard API when device policy is enabled." into froyo