tree 478d16871ea656aea0dd28139c855b54f77033a5
parent a797e4669ee2c1243438ea22197fd5cdf8e1038d
parent ebeef1babe39de2c1d97429a93ea956c655cd377
author Alice Yang <alice@google.com> 1378279588 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1378279588 +0000

Merge "Revert "Revert "Fix hierarchical folders""" into jb-ub-mail-ur10