tree 1de0bdf145436d2ce71bb665124fc24871ace417
parent f650bba322f2cf6636892dcc0914de52a2693f84
parent 671fed2cbef56835fff22360711505147882fa83
author Jim Miller <jaggies@google.com> 1258009694 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258009694 -0800

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