tree 0d69b71593e49ed8751559f16457dd72e83ae5ac
parent 24317443fde973c762afbea1a3f6f2c830dfe3dd
parent 05de7c882e0ae8d9ea10f4de9421b2e05bf29fa9
author Jim Miller <jaggies@google.com> 1261181431 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1261181431 -0800

am 05de7c88: Merge change I420cc110 into eclair-mr2

Merge commit '05de7c882e0ae8d9ea10f4de9421b2e05bf29fa9' into eclair-mr2-plus-aosp

* commit '05de7c882e0ae8d9ea10f4de9421b2e05bf29fa9':
  Fix 2318046: Modify PIN entry layout in keyguard so it works well on HVGA as well as WVGA devices.