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

Browse Source

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

...

This commit is contained in:

Dianne Hackborn 2011-12-07 17:14:48 -08:00 committed by Android Git Automerger

parent a6d2bbc22f 74bb0375a7

commit b69e488d5d

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