am 41e0b205: am 2657d889: (-s ours) am b259c04d: Merge "Merge commit \'eee12419\' into manualmerge" into ics-mr1

Browse Source

* commit '41e0b205c4ac28b2ca583d9de5ea1676786ba882':
  DO NOT MERGE.  Integrate from MR 1 to fix issue #5366535: Lockscreen...

...

This commit is contained in:

Dianne Hackborn

2011-12-07 17:16:49 -08:00

committed by Android Git Automerger

parent 1deceb8fb6 41e0b205c4

commit 71a2968e29

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

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

Diff Content Not Available