tree 10da860fcff71886af91d082e31f0e1917926848
parent 677b7a7b024adfc3b9e87cff974acb4420a0ded1
parent fd19bf17572e1a4d5d92fa53ad033f5d07261665
author Adam Cohen <adamcohen@google.com> 1414566110 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566110 +0000

am fd19bf17: am 2b7cc999: am 42289332: am ee5b470b: am b8f7475c: am e269ca42: Merge "Ensuring that snapToPage is completely aborted / cleaned up upon setCurrentPage (issue 11003904)" into jb-ub-now-indigo-rose

* commit 'fd19bf17572e1a4d5d92fa53ad033f5d07261665':