| commit | fc1d64aab32c2c2af7e0e7fc1742a01dc6b0d94b | [log] [tgz] |
|---|---|---|
| author | Andrew Stadler <stadler@android.com> | Tue Jun 08 10:14:53 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 08 10:14:53 2010 -0700 |
| tree | 033ef14f7bc462e84bc2e9d53c9f514c09ddb877 | |
| parent | acd7aa4266bb599e085b5f9a6462f3a3d27f6201 [diff] | |
| parent | 2e5e068710e6af9d6d5073e3dda7f11c4ae890cd [diff] |
am 285486a2: (-s ours) am 3ee0cad5: (-s ours) DO NOT MERGE Workaround for KeyguardLock problem