am db33d4bb: Merge change 21468 into eclair
am db33d4bb: Merge change 21468 into eclair

Merge commit 'db33d4bbaeedf2095968ec7795b488038cdcd015'

* commit 'db33d4bbaeedf2095968ec7795b488038cdcd015':
  Couple of fixes for viewport.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base