am 5b8f013a: Merge "Fix NPE in deleted contact removal" into klp-dev

* commit '5b8f013a34eee576cc3c12ced3843aaeea3a2ca6':
  Fix NPE in deleted contact removal
tree: 81c06669eedb38d7cadf103d8c5e79d670e8bdb9
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags