Merge change I428bc0fc into eclair

* changes:
  Remove STOPSHIP BT logging.
Import revised translations.  DO NOT MERGE

Approver: jerryw
am 5b61241c: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '5b61241c90be1a30d18fe6da116edc16d0ea1b1e' into eclair-mr2

* commit '5b61241c90be1a30d18fe6da116edc16d0ea1b1e':
  Import revised translations.  DO NOT MERGE
Adapt to the new interface of vCard code.

Internal Issue number: 2160039
Import revised translations.  DO NOT MERGE
Reimport translations.

Change-Id: Ib613aca3ba7ad0ab906210da90f28699ec96d5dd
am da9ca291: (-s ours) am 5b61241c: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit 'da9ca2915b56dc964ce1e4e53c0cd9085a3c7ea4'

* commit 'da9ca2915b56dc964ce1e4e53c0cd9085a3c7ea4':
  Import revised translations.  DO NOT MERGE
am 4ceaa3e0: Adapt to the new interface of vCard code.

Merge commit '4ceaa3e03dc7a68d4e7c0c8e14a461cfd7c4c19c'

* commit '4ceaa3e03dc7a68d4e7c0c8e14a461cfd7c4c19c':
  Adapt to the new interface of vCard code.
am 19b9dd3e: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '19b9dd3e31e2e7deff759506f9442b08426b91d7'

* commit '19b9dd3e31e2e7deff759506f9442b08426b91d7':
  Import revised translations.  DO NOT MERGE
Fix a build breakage.

Make Bluetooth code use new type instead of old.
am 59582607: Fix a build breakage.

Merge commit '59582607bc341f9e9662d6ec5c1a93bb4c537d38'

* commit '59582607bc341f9e9662d6ec5c1a93bb4c537d38':
  Fix a build breakage.
Import revised translations.  DO NOT MERGE

Approver: jerryw
am 99232162: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '992321621151fb0c6d8784c3009472a29f0c6a89' into eclair-mr2

* commit '992321621151fb0c6d8784c3009472a29f0c6a89':
  Import revised translations.  DO NOT MERGE
am d74a0f97: (-s ours) am 99232162: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit 'd74a0f978908797aab90190ad243e0ee8f42a04d'

* commit 'd74a0f978908797aab90190ad243e0ee8f42a04d':
  Import revised translations.  DO NOT MERGE
Disable sending Photo field for PBAP. Do Not Merge.

Some car kits don't handle contacts with Photo Fields well.
Disable this field for the time being.

Original Change by: Yue Lixin

Bug: 2183320
Dr No: Eastham
Fix a typo.
Fix a typo.
Merge change I51d7be27 into eclair-mr2

* changes:
  Fix a typo.
am e10881ae: Fix a typo.

Merge commit 'e10881ae39eb4affb7a78827f2060964e8534515'

* commit 'e10881ae39eb4affb7a78827f2060964e8534515':
  Fix a typo.
am 31cea05f: Merge change I51d7be27 into eclair-mr2

Merge commit '31cea05f854d0f7b9be07472d85128cc0f44e85a'

* commit '31cea05f854d0f7b9be07472d85128cc0f44e85a':
  Fix a typo.