tree 2a733deb9bfafabaafa36acce8840f8f8c6863e6
parent 3b8a1b3513bae8fc0846d52121d243bec7cb65b8
parent 609bbf182e4b4f39b6be7ed01331887ca70ea4c1
author Daniel Sandler <dsandler@google.com> 1258051116 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258051116 -0800

am 609bbf18: Merge change I54089080 into eclair

Merge commit '609bbf182e4b4f39b6be7ed01331887ca70ea4c1' into eclair-mr2

* commit '609bbf182e4b4f39b6be7ed01331887ca70ea4c1':
  Update keyguard and pattern-lock layouts for new UX designs.