am 21d3bd2d: am ec239ed1: am d94b24bc: Merge "Consolidate CallSubject history and dialog." into mnc-dr-dev

* commit '21d3bd2d697671c7d0259b0e2f96e617475716d5':
  Consolidate CallSubject history and dialog.
tree: 06164b3b1a291821965938028c7202a9a91c6768
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags