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.