tree 6afa66dae5d2124106f824f450c690bb058ba642
parent 1db7a31a45c234eb18bd788264591859bee64815
parent 54854d311731b321e2bb2faec06bacb11d1fe07f
author The Android Open Source Project <initial-contribution@android.com> 1323471468 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1323471468 -0800

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

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