tree f9160f653ba7863e11c1b9a490f915d6c2262fec
parent 4e4d65990ab6134f588330621fc594b0f33f0fb8
parent e269ca4298eb4be7c4e07bfb67cfb7dcf38c274f
author Adam Cohen <adamcohen@google.com> 1380718737 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380718737 -0700

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

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