Merge "Fix NPE in deleted contact removal" into klp-dev
tree: e9888fec51ff040d7589628f34ff9f85fd4c8b54
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags