tree 17b4da59393a08b49b0abf9b2421c2fc0ae3cc58
parent e01a3a9780a9ea346d1401ae2ac1469832ae50c7
parent be9c52fff17760dc83fd156bb0730a645e836aeb
author Adam Cohen <adamcohen@google.com> 1434392779 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1434392779 +0000

am be9c52ff: Merge "Remove inifinite recursion from PagedView" into ub-launcher3-burnaby

* commit 'be9c52fff17760dc83fd156bb0730a645e836aeb':
  Remove inifinite recursion from PagedView