am 97e70fce: Merge "Save CNAP in call history" into mnc-dev

* commit '97e70fcea88ec2bc70f83f09f095aaf3a293553f':
  Save CNAP in call history
tree: 4d652201130ce9a813f7cc1d75cfd6decef68d51
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags