Merge "Fix bug that phone number is shown for local contacts."
am: 0c396de3c9

Change-Id: I146f5a4ae2eaf82714b7e7b539cfd68895a22039
tree: 90fffe63a2df2c1e80f3dc64298dd20d58e823b9
  1. assets/
  2. java/
  3. Android.mk
  4. AndroidManifest.xml
  5. CONTRIBUTING
  6. LICENSE