am 3e2bf19e: Merge change I5ee7b933 into eclair

Merge commit '3e2bf19e4c3fe98c734a8667717a6c6ca70b5221' into eclair-plus-aosp

* commit '3e2bf19e4c3fe98c734a8667717a6c6ca70b5221':
  Mark a ContactsProvider string as being untranslatable.