| commit | db603bb54fe7cf0ba3c02f1d8b7bc793d94d145b | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Tue Jun 08 16:35:21 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 08 16:35:21 2010 -0700 |
| tree | 96a267251627b2af94da33213fa53c5138bc4f87 | |
| parent | 37583aebc4b87ccd09b4012cf23d2ca24125c9a4 [diff] | |
| parent | 3b68548da60ab3249fbc89b8e587e22485630f32 [diff] |
am 3b68548d: am 75b6a6b9: Merge "Fix 2737842: Disable KeguardManager API if device policy is enabled" into froyo