am dc0ae5a4: am 936a72b5: Merge "Use same dismissed tombstone state as Gmail" into klp-dev

* commit 'dc0ae5a4e265147beb080a4ce7bd10eaeef3462d':
  Use same dismissed tombstone state as Gmail
tree: 29e35fe59557b471d2f45fd59f5ad166089744bf
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags