Merge "Fix NPE in getPhoneType/getEmailType" into ub-contactsdialer-a-dev
tree: 1ed94cba2e0d9c23ea1642dcdab653e821b8ac02
  1. src/
  2. TestCommon/
  3. tests/