| commit | 285486a27825cedbb26de1d3859a3d15d92e9847 | [log] [tgz] |
|---|---|---|
| author | Andrew Stadler <stadler@android.com> | Mon Jun 07 18:32:09 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 07 18:32:09 2010 -0700 |
| tree | 5a6d7911ac11478fe8a5fac7a48a0a147a217fd2 | |
| parent | ae432137b78f731e58b62af9205224feb568b09f [diff] | |
| parent | 3ee0cad5f5e21a24dbe43d21afaac1dd76a2059b [diff] |
am 3ee0cad5: (-s ours) DO NOT MERGE Workaround for KeyguardLock problem Merge commit '3ee0cad5f5e21a24dbe43d21afaac1dd76a2059b' into kraken * commit '3ee0cad5f5e21a24dbe43d21afaac1dd76a2059b': DO NOT MERGE Workaround for KeyguardLock problem