| commit | 1a0ce1cc6f6bda7ef7345b20860bc0c8cd3d8451 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Tue Jun 08 16:37:12 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 08 16:37:12 2010 -0700 |
| tree | b5e18740a747d0c160fe8f6fd66d6c55f73b6028 | |
| parent | 570898098f9b7c654633627d016a257bd37cd2e5 [diff] | |
| parent | db603bb54fe7cf0ba3c02f1d8b7bc793d94d145b [diff] |
am db603bb5: am 3b68548d: am 75b6a6b9: Merge "Fix 2737842: Disable KeguardManager API if device policy is enabled" into froyo