tree f9160f653ba7863e11c1b9a490f915d6c2262fec
parent d40b2e993f9e200081b3f9a3b06ca9dc7cccb94e
parent b8f7475c32627a53bf23b914cd904b4f2e9dff57
author Adam Cohen <adamcohen@google.com> 1380722295 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380722295 -0700

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

* commit 'b8f7475c32627a53bf23b914cd904b4f2e9dff57':
  Ensuring that snapToPage is completely aborted / cleaned up upon setCurrentPage (issue 11003904)