tree 4494a5893e8faec1364071715c7a89ecac5c2268
parent 60660ab0f4c3e8aaa2a01d87f0f8a9a0e1b78e16
parent cfdfbf9fe5655bbd4db29c778ec2a11e5a9beb76
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...