am 54854d31: Reconcile with ics-mr0-release ics-mr1-release

Browse Source

* commit '54854d311731b321e2bb2faec06bacb11d1fe07f':
  More fixing for issue #5366535: Lockscreen has wrong layout...
  DO NOT MERGE.  Integrate from MR 1 to fix issue #5366535: Lockscreen...

...

This commit is contained in:

The Android Open Source Project 2011-12-09 14:57:48 -08:00 committed by Android Git Automerger

parent 3a51491c7e ddbd1fd2bd

commit 001e423026

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