| commit | 3b68548da60ab3249fbc89b8e587e22485630f32 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Tue Jun 08 16:33:26 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 08 16:33:26 2010 -0700 |
| tree | 2f7caf5654ffecfb79e24668a1a237106417672a | |
| parent | 1debc66521f699bbf0a8eb80cababaef8bc63607 [diff] | |
| parent | 75b6a6b972e6b18143fd629d3d9c824c442c5f4c [diff] |
am 75b6a6b9: Merge "Fix 2737842: Disable KeguardManager API if device policy is enabled" into froyo Merge commit '75b6a6b972e6b18143fd629d3d9c824c442c5f4c' into kraken * commit '75b6a6b972e6b18143fd629d3d9c824c442c5f4c': Fix 2737842: Disable KeguardManager API if device policy is enabled