tree 48f08e7f36871201361aae521cf5db4ece968254
parent 0eb8d31430fb8f9e1f25119220312918206b05ea
parent 78a4b7993b95d0f0270a0bb0ce58355fe5963e97
author Michael Jurka <mikejurka@google.com> 1338492699 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1338492699 -0700

am 78a4b799: Merge "Making folders open/close smoothly" into jb-dev

* commit '78a4b7993b95d0f0270a0bb0ce58355fe5963e97':
  Making folders open/close smoothly