tree 9638d47c87d605f6a74c09af93d972ea1e06ab26
parent 4646fd7899f2431afaba3387c33446a317763df0
parent 537ecd451b021545b8d9c4009879fe961bff3de6
author Adam Cohen <adamcohen@google.com> 1392411776 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411776 +0000

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

* commit '537ecd451b021545b8d9c4009879fe961bff3de6':
  Fix issue where deleting item from folder leaves extra page