tree cba62d0d64153aa2169651696bc238591341d679
parent 4feb47db8c06d5bf1e33dedebaaf575fbc91a894
parent 537ecd451b021545b8d9c4009879fe961bff3de6
author Adam Cohen <adamcohen@google.com> 1414085568 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085568 +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':