am f8da578e: resolved conflicts for merge of a442e791 to eclair-mr2-plus-aosp

Merge commit 'f8da578ee7d398f21e002947505cddf827937a98'

* commit 'f8da578ee7d398f21e002947505cddf827937a98':
  Fix 2268841: Updated portrait tab lockscreen to match latest PPL.