tree a7001e27627197a10ffa8a199a535ed0f7a460f3
parent dd1f90b5e7e77f6646213758e775666510e38ed8
parent 0e8dc84326ad3e6d146a203538665f98dd98f688
author Scott Kennedy <skennedy@google.com> 1379717964 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1379717964 +0000

Merge "Hierarchical folders in conversation list" into jb-ub-mail-ur10