tree 48f08e7f36871201361aae521cf5db4ece968254
parent 576eb88e812290c9c85815b57be1dade976d8131
parent 6f8e526e2818e4ceb39cede79abcf2d48cfc4c8f
author Michael Jurka <mikejurka@google.com> 1338492859 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1338492859 -0700

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

* commit '6f8e526e2818e4ceb39cede79abcf2d48cfc4c8f':
  Making folders open/close smoothly