tree 6ad417cd9f30f926e0a16fa894609fa325dc2157
parent f9dda1ee9be4db8b2bc4dad25230bdbff1df147b
parent 8f580078c51cd4b116d48323c209f7f803ad7f46
author Andrew Sapperstein <asapperstein@google.com> 1378247669 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1378247669 -0700

am 8f580078: Merge "Delete CAN_HOLD_MAIL folder capability." into jb-ub-mail-ur10

* commit '8f580078c51cd4b116d48323c209f7f803ad7f46':
  Delete CAN_HOLD_MAIL folder capability.