tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent ab9135e49001cce0dbd93c07bf3cc7c966b11a1f
parent ee5b470b341be0908333a1ae03f323d0b614e032
author Adam Cohen <adamcohen@google.com> 1392410133 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410133 +0000

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 'ee5b470b341be0908333a1ae03f323d0b614e032':