tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent 9d321ecf5c1ed4b3d24b0c227e4b70fc24036279
parent 42289332f6c830415e88824176c9139e9b753efd
author Adam Cohen <adamcohen@google.com> 1392411015 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411015 +0000

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 '42289332f6c830415e88824176c9139e9b753efd':