am ee2d8cd5: am cbe397f2: Merge "b/3348192 re-enable snap scrolling mode." into honeycomb
am ee2d8cd5: am cbe397f2: Merge "b/3348192 re-enable snap scrolling mode." into honeycomb

* commit 'ee2d8cd5bc50589229b469b80b2724836d83e6eb':
  b/3348192 re-enable snap scrolling mode.

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