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

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