tree 74edfb6c999797c366b317c462cad1a22e2f04e5
parent b7cf2ecbb712a43ecc4a8a10acbbd36f9d25e34d
parent ee7c63da505ccee3e391cf1baa2f64b7db78aaa9
author Jin Cao <jinyan@google.com> 1397847843 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397847843 +0000

am ee7c63da: Merge "Inconsistent state after emptying trash" into ub-gmail-ur12-dev

* commit 'ee7c63da505ccee3e391cf1baa2f64b7db78aaa9':
  Inconsistent state after emptying trash