YQ-DemoGit / base / c4e37ac0ea0 - Bitbucket

Commits

d5f401ba51d + bde25c20773

Jim Miller authored and Android Git Automerger committed c4e37ac0ea0M08 六月 2010

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.

Showing diff tod5f401ba51d