am 36818b38: am 2ba297d1: Merge change I9890c2d4 into eclair

Merge commit '36818b380dbb19275ba92fc8e307591ea7bffba4' into eclair-mr2-plus-aosp

* commit '36818b380dbb19275ba92fc8e307591ea7bffba4':
  Fix 2209086: Fix landscape layout of LockScreen on devices with a keyboard