am 2ba297d1: Merge change I9890c2d4 into eclair

Merge commit '2ba297d19e101ab3c6456aa7813a043d66c572b6' into eclair-plus-aosp

* commit '2ba297d19e101ab3c6456aa7813a043d66c572b6':
  Fix 2209086: Fix landscape layout of LockScreen on devices with a keyboard