tree cba62d0d64153aa2169651696bc238591341d679
parent a594a8530659a3557c6eea733350e14d97da1c7d
parent 2b7cc99975107e82e07b7834f193b08ed79b7931
author Adam Cohen <adamcohen@google.com> 1414085224 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085224 +0000

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 '2b7cc99975107e82e07b7834f193b08ed79b7931':