am 98268400: Merge "Use the terms "Link and Unlink" instead of "Merge and...
am 98268400: Merge "Use the terms "Link and Unlink" instead of "Merge and separate"." into ub-contactsdialer-a-dev
* commit '98268400':
Use the terms "Link and Unlink" instead of "Merge and separate".