tree 1e544736515c5d1cd768564b879a0b96eae62a88
parent d62b1b9349b0ef255e91f770f808932b24d8e409
parent 687f69342a40b191d2236d2e259430eebbc33fb4
author Scott Kennedy <skennedy@google.com> 1363825445 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1363825445 +0000

am 687f6934: Merge "Change FolderType to a bitmask" into jb-ub-mail-ur9

* commit '687f69342a40b191d2236d2e259430eebbc33fb4':
  Change FolderType to a bitmask