| commit | 688c6832ca4663c0cdbd33f4ae17e1eb3cef142b | [log] [tgz] |
|---|---|---|
| author | Adam Cohen <adamcohen@google.com> | Fri Feb 14 20:58:40 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 14 20:58:40 2014 +0000 |
| tree | 4e7ec699006b78d116024621f74302c250c1cfaa | |
| parent | d1a4d42dc4578703f32383f02ef015d7a477ec64 [diff] | |
| parent | 2b7cc99975107e82e07b7834f193b08ed79b7931 [diff] |
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':