am 5609558c: am 758b5b25: Merge change I35155c1d into eclair-mr2
am 5609558c: am 758b5b25: Merge change I35155c1d into eclair-mr2

Merge commit '5609558c02b39ed50e44767f472c440f36eeef8e'

* commit '5609558c02b39ed50e44767f472c440f36eeef8e':
  divide mRestoredScale before use

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