diff options
| author | Jim Miller <jaggies@google.com> | 2010-06-07 19:26:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-07 19:26:28 -0700 |
| commit | c4e37ac0ea01e346ffa635a074222f6bc8671e14 (patch) | |
| tree | c3dd1f3ffc1bd8f4b502657c2c51f52f05405320 /camera | |
| parent | d5f401ba51d9f200cd25ee58eec99134576d78d9 (diff) | |
| parent | bde25c207731783a62e3611586fe05cd35add0d9 (diff) | |
| download | frameworks_base-c4e37ac0ea01e346ffa635a074222f6bc8671e14.zip frameworks_base-c4e37ac0ea01e346ffa635a074222f6bc8671e14.tar.gz frameworks_base-c4e37ac0ea01e346ffa635a074222f6bc8671e14.tar.bz2 | |
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.
Diffstat (limited to 'camera')
0 files changed, 0 insertions, 0 deletions