Merge "Show blocked contact instead of profile photo." into ub-contactsdialer-a-dev
tree: 455137d15d16b4673660e466543501a5e878b8e2
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags