tree f9160f653ba7863e11c1b9a490f915d6c2262fec
parent 1970614d0980699a6858a098dd1e13e65664ab47
parent 97d5311e2a84a9ece018ff9593be2c0012ccb223
author Adam Cohen <adamcohen@google.com> 1380651671 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1380651672 +0000

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