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

Browse Source

Merge commit '3ee0cad5f5e21a24dbe43d21afaac1dd76a2059b' into kraken

* commit '3ee0cad5f5e21a24dbe43d21afaac1dd76a2059b':
  DO NOT MERGE Workaround for KeyguardLock problem

...

This commit is contained in:

Andrew Stadler 2010-06-07 18:32:09 -07:00 committed by Android Git Automerger

parent ae432137b7 3ee0cad5f5

commit 285486a278

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available