am 350b3bbd: am ea8fa952: Merge "Ensure contact identifier is consistent for all letter tile avatars"

* commit '350b3bbd85389c90c8c85336b2227f42cfc4faf1':
tree: 967f2714b7c695a2c8690d8099672ae2c639bbb8
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags