tree 32cb602cee2d9cd0350873d77f56ae37ac19d5fa
parent c0bd6ac257218f4eefab08da377778be6adda8ce
parent 9fdf3868aa4f1fdc7295759e24a0c7498ee98c60
author Michael Jurka <mikejurka@google.com> 1365546391 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365546391 -0700

am 9fdf3868: am 29a0390b: Merge "Fix bug where folder open animation gets finished early" into jb-mr2-dev

* commit '9fdf3868aa4f1fdc7295759e24a0c7498ee98c60':
  Fix bug where folder open animation gets finished early