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

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