tree dc7a2376d1b713062dfe2e22081241f7ed455b70
parent e1855846a47e02b129acf978ec102cdd3d8b74f7
parent 7188d6887e6d7a5d1dc86c77aeeec33c4ffc6568
author Jim Miller <jaggies@google.com> 1275963885 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1275963885 -0700

Merge "Fix 2737842: disable keyguard API when device policy is enabled." into froyo