am 96ae98f9: Make BluetoothPbapCallLogComposer use FLAG_REFRAIN_IMAGE_EXPORT.
Remove wrong merge.

Change-Id: I94ff5633226d37fcc2df39fdcb7ad313a523d435
Add tags around string formatting placeholders.

Make the wording of one error message more idiomatic.

Change-Id: Ibb59089ee894dbc65cc1ec8e62c0dc33118c51f4
Merge commit '0894f16289755e5d3e81e0d8c1c8097179aeb7f7' into oxygen_4.3

* commit '0894f16289755e5d3e81e0d8c1c8097179aeb7f7':
  Remove wrong merge.

Conflicts:
	src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
Merge commit 'b8292c30db4454eaafe404d923572d0e48596b7f' into oxygen_4.3

* commit 'b8292c30db4454eaafe404d923572d0e48596b7f':
  Add tags around string formatting placeholders.