| commit | 4518723fc8f781ec91f36ccd8c355d05ef8f0c9f | [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 | 14f9975d51447ccd9029b8aeb00b0c11e2038f5d | |
| parent | 7b268e7967ed9042e6649edc38ecaaa6914aa33a [diff] | |
| parent | c8bc7d3d592e9f0aed0559c65cc8e2d27bdc1c53 [diff] |
am db603bb5: am 3b68548d: am 75b6a6b9: Merge "Fix 2737842: Disable KeguardManager API if device policy is enabled" into froyo