am 1f42641e: am 5adeba4b: Merge change 25059 into eclair
am 1f42641e: am 5adeba4b: Merge change 25059 into eclair

Merge commit '1f42641ebf775d0438f2694876067e547a40527a'

* commit '1f42641ebf775d0438f2694876067e547a40527a':
  special-case coordinate conversion when we are taking content coordinates to be invalidate. We need to

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