tree bb3e26939a6b6a0c0b0b5ab4b12fe4f0dc5d7bf3
parent b69e488d5d88848e34ddfdc775ae6b506737f5ab
parent c93e600bb2d08b9ef5e028f8620354f00ccd1c4d
author Dianne Hackborn <hackbod@google.com> 1323307027 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1323307027 -0800

am 7377e593: am 0e385ee4: am b32785c6: Merge "More fixing for issue #5366535: Lockscreen has wrong layout..." into ics-mr0

* commit '7377e59314885b8ef65bd19d04984998cb2e5ff4':
  More fixing for issue #5366535: Lockscreen has wrong layout...