tree 3b0567e6ad875f6276240e3b7091b341b27ec583
parent 912ac2d10c7190536bb894f1257f3ffa9cce52fb
parent 8f27eff2e650c4794c6f60477891096ed9e2b841
author Tony Mantler <nicoya@google.com> 1414957979 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414957979 +0000

am 8f27eff2: am d501dabc: am 570a7b00: am ec86c424: Don\'t allow starring messages in trash in CAB mode

* commit '8f27eff2e650c4794c6f60477891096ed9e2b841':
  Don't allow starring messages in trash in CAB mode