| commit | c8bc7d3d592e9f0aed0559c65cc8e2d27bdc1c53 | [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 | 1a1c3f4f0dc80c03e68d3bff277e82dad0005830 | |
| parent | 9a96cb5d5afd5285ac226c94b438f0b28263c0a1 [diff] | |
| parent | 9cc61ca4877e8215ecf691d0cae2876be8329249 [diff] |
am 3b68548d: am 75b6a6b9: Merge "Fix 2737842: Disable KeguardManager API if device policy is enabled" into froyo