am 28092175: am 3e2bf19e: Merge change I5ee7b933 into eclair

Merge commit '280921755bfa75748d555036d56615535b4d9c0f'

* commit '280921755bfa75748d555036d56615535b4d9c0f':
  Mark a ContactsProvider string as being untranslatable.