am f9e8d7d0: am 13eeaa6f: Merge "Fix wrong contact being hidden from favorites" into klp-dev

* commit 'f9e8d7d04dcfcda4e2239a4068c7bc0ccf435af1':
  Fix wrong contact being hidden from favorites
tree: 538cf87eb7b9e7dceafcc07a0b9e1e3cc94bd662
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags