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

Merge commit '33c8d07aabb0a4ea197423c4ba4026b42e306987'

* commit '33c8d07aabb0a4ea197423c4ba4026b42e306987':
  Fix 2209086: Fix landscape layout of LockScreen on devices with a keyboard