OSDN Git Service

am 54854d31: Reconcile with ics-mr0-release ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 9 Dec 2011 22:57:48 +0000 (14:57 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 9 Dec 2011 22:57:48 +0000 (14:57 -0800)
commite154d13b47d7a2bf5968a7c6070da15814d3c544
treece0df52bd6db87dbbd294b0b0260ec9af29dd3db
parent901e78d96eec495bda0dbe2e2b73009951301817
parent68c79e2bd8fce31fd826c2dd93ed639984c71cb2
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...