am d38ce89c: (-s ours) am f9e8d7d0: am 13eeaa6f: Merge "Fix wrong contact being hidden from favorites" into klp-dev

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