am 41bf2e4c: Merge "Consolidate setPhoto logic." into ub-contactsdialer-a-dev

* commit '41bf2e4c8c9793d2f218ce1d1835bfa957ba53e4':
  Consolidate setPhoto logic.
tree: 4c36454d62c1f0389c047090a7569a820307f0fe
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags