am 600c6f6b: am a3e079dd: Merge "Use circular support in ContactPhotoManager"

* commit '600c6f6b4ff84baa3ad42cec0cc3986471b7e877':
tree: c2175942e3a631ad112fe6ab17da560c45fc1ae2
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags