tree 13114fc0844c3bfc54b53773788f3b7fd8eedcbf
parent a5bf5b3a2a695ac307ebe1be27f420d93a657bb4
parent 03f1239aec39f8e3e3ade0e8c78df5836d5f4fc2
author Alice Yang <alice@google.com> 1378279827 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1378279827 -0700

am 03f1239a: Merge "Revert "Revert "Fix hierarchical folders""" into jb-ub-mail-ur10

* commit '03f1239aec39f8e3e3ade0e8c78df5836d5f4fc2':
  Revert "Revert "Fix hierarchical folders""