| commit | c9d6dde70701f1bc13f2b7f13c94d0b60a453efb | [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 | e69ba3b38e587fa51491c8cca8e1adf93fbca854 | |
| parent | fd83c8d5e3dbe9b28978890f2096c826cdf74fdc [diff] | |
| parent | 77a885523c5d49bccca0540ab531740c49f456f1 [diff] |
am a9a0a0b2: am 7d70358a: am bde25c20: Merge "Fix 2737842: disable keyguard API when device policy is enabled." into froyo