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

* commit 'f9e8d7d04dcfcda4e2239a4068c7bc0ccf435af1':
tree: 701114b5c0756dc29829857bdb8d6e8048c01ac0
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags