| commit | 4c58e3ac696e6bcde5a925e48dd4284e880c7d4b | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Mon Jun 07 19:26:28 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 07 19:26:28 2010 -0700 |
| tree | 2e6c7cfa32c293f7fd4aa65eb772567fe6465e65 | |
| parent | f023c4ce5b5d20f0317048c2180df41be23f0578 [diff] | |
| parent | c354b89c761149ee0d3393f4f388e8416f52e963 [diff] |
am bde25c20: Merge "Fix 2737842: disable keyguard API when device policy is enabled." into froyo Merge commit 'bde25c207731783a62e3611586fe05cd35add0d9' into froyo-plus-aosp * commit 'bde25c207731783a62e3611586fe05cd35add0d9': Fix 2737842: disable keyguard API when device policy is enabled.