tree dc4e2373a0d65eb8f06beef71e1493f3620a75c4
parent 24305cd5c095c5d47433c39b4c40c76c46290baf
parent 01f30509c4c8ad0d13b7635447b7f023c7a0cab7
author Mindy Pereira <mindyp@google.com> 1344969004 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1344969005 -0700

Merge "Show remove folder option in user created labels." into jb-ub-mail