| commit | aed22d27bbeb4c5f1f5b8d6ff0c49cdf5c698985 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Tue Jun 08 10:15:21 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 08 10:15:21 2010 -0700 |
| tree | 2d912bdf69edfd5238d4078ebfa8595a6191d263 | |
| parent | c2bce63b6687e2e13c0fadc16ced64b08866cd57 [diff] | |
| parent | a9a0a0b29809447513a1acbf7672bedcec22999b [diff] |
am a9a0a0b2: am 7d70358a: am bde25c20: Merge "Fix 2737842: disable keyguard API when device policy is enabled." into froyo