tree 10da860fcff71886af91d082e31f0e1917926848
parent fd523263f4750a4ea41badafdd19c2fbb541a5cf
parent cf00d3ca592037e20053c2d2a7fd734c270e275f
author Adam Cohen <adamcohen@google.com> 1414566464 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566464 +0000

am cf00d3ca: am 537ecd45: am 8df1285d: am 0259c629: Merge "Fix issue where deleting item from folder leaves extra page" into jb-ub-now-kermit

* commit 'cf00d3ca592037e20053c2d2a7fd734c270e275f':