am 285486a2: (-s ours) am 3ee0cad5: (-s ours) DO NOT MERGE Workaround for KeyguardLock problem

This commit is contained in:
Andrew Stadler 2010-06-08 10:14:53 -07:00 committed by Android Git Automerger
commit 96d40ec87b

Diff Content Not Available