tree 648cabeaa5208cb21155f5d3e5b45b0e43d18159
parent bc83dec6da0b6d326c00ff531bbe8447b62abbb9
parent 6e604d33ee0aab10a72c836af6e83ace315f4b79
author Alice Yang <alice@google.com> 1378245462 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1378245462 +0000

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