am 961d2c6a: Merge "b/3350774 avoid screen jumping when pinching to zoom." into honeycomb
am 961d2c6a: Merge "b/3350774 avoid screen jumping when pinching to zoom." into honeycomb

* commit '961d2c6acf9a4a61648f040aaaf1e40a83674d59':
  b/3350774 avoid screen jumping when pinching to zoom.

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