am 6896e4a0: am 29f7c113: (-s ours) am 369e965c: am 64be2416: am ffb07daa: (-s ours) am 0b218533: Merge "Fix for letter tile avatars not displaying properly in calllog DO NOT MERGE" into klp-dev

* commit '6896e4a09f36174142c09fc026a1ae5affba77ac':
  Fix for letter tile avatars not displaying properly in calllog DO NOT MERGE
tree: ff8f13edbe71f7cfbe12296f2cf14814833c4fe2
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags