tree 1e544736515c5d1cd768564b879a0b96eae62a88
parent 91f8670c16dcb54e8881220dcdb6a53d54dc48d9
parent 8c1058ee75ec4a5824a68c3c5275bc48d56bbad8
author Scott Kennedy <skennedy@google.com> 1363825349 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1363825354 +0000

Merge "Change FolderType to a bitmask" into jb-ub-mail-ur9