am bf992c5b: (-s ours) Fix string placeholders that got mangled in translation.  DO NOT MERGE

Merge commit 'bf992c5b8417c41779e6cb5890b65949dc3353bf' into gingerbread

* commit 'bf992c5b8417c41779e6cb5890b65949dc3353bf':
  Fix string placeholders that got mangled in translation.  DO NOT MERGE
am 037bb6c9: am bf992c5b: (-s ours) Fix string placeholders that got mangled in translation.  DO NOT MERGE

Merge commit '037bb6c989f4bbce24585abcca790fdc3115ff14' into gingerbread-plus-aosp

* commit '037bb6c989f4bbce24585abcca790fdc3115ff14':
  Fix string placeholders that got mangled in translation.  DO NOT MERGE
am 0aabafe3: (-s ours) am 037bb6c9: am bf992c5b: (-s ours) Fix string placeholders that got mangled in translation.  DO NOT MERGE

Merge commit '0aabafe3bb8c8d1de6dfbc8b54509aac02f91a4e'

* commit '0aabafe3bb8c8d1de6dfbc8b54509aac02f91a4e':
  Fix string placeholders that got mangled in translation.  DO NOT MERGE
Let BT use FLAG_REFRAIN_IMAGE_EXPORT.

Bug: 2603200
Change-Id: I385e831b8c5684cc75c249ee6d41d5256a29f3c5
Fix string placeholders that got mangled in translation.  DO NOT MERGE

Pull the new versions of the three affected strings back from gingerbread
(where the placeholders are explicitly marked as such) and reimport the
zh-rTW translations.

Change-Id: Ica839e87d3efe32f5cc8ae0ab42346d8f60d3015
For PBAP, Limit the number of call log to CALLLOG_NUM_LIMIT
am 77b122f5: For PBAP, Limit the number of call log to CALLLOG_NUM_LIMIT

Merge commit '77b122f551ae37811c75ae76fa2029f7b3f2f404' into gingerbread-plus-aosp

* commit '77b122f551ae37811c75ae76fa2029f7b3f2f404':
  For PBAP, Limit the number of call log to CALLLOG_NUM_LIMIT
am 541939ff: am 77b122f5: For PBAP, Limit the number of call log to CALLLOG_NUM_LIMIT

Merge commit '541939ff48867b2a8656503d29f29eb6bf6f1a30'

* commit '541939ff48867b2a8656503d29f29eb6bf6f1a30':
  For PBAP, Limit the number of call log to CALLLOG_NUM_LIMIT
BT - Not possible to accept incoming obex transfers using key-presses.

It is not possible to accept/reject an incoming obex file transfer
using key-press. Only touch screen press was working.

With this fix, key press down is not ignored and it is possible
to accept/reject an incoming obex file transfer with key-press.

ST-Ericsson Change ID: ER260817
Change-Id: Ic7f668bd1b0efa549d0218edc8719efee1984941

Signed-off-by: Christian Bejram <christian.bejram@stericsson.com>
reconcile froyo-release into gingerbread

Change-Id: I5b2492a62bab246a41ad43f45f7a1d4c13b15985
am 58ffcb38: reconcile froyo-release into gingerbread

Merge commit '58ffcb38828199b04a756e93a525779554efd9c9' into gingerbread-plus-aosp

* commit '58ffcb38828199b04a756e93a525779554efd9c9':
  Fix string placeholders that got mangled in translation.  DO NOT MERGE
am f7394446: (-s ours) am 58ffcb38: reconcile froyo-release into gingerbread

Merge commit 'f739444694a8378142250f930bc575f9628d7ace'

* commit 'f739444694a8378142250f930bc575f9628d7ace':
  Fix string placeholders that got mangled in translation.  DO NOT MERGE
Trim unwanted whitespace from translations.  DO NOT MERGE

Change-Id: I22c96b9e3540bd220c01987a0830c3e6b2420e29
Merge "Trim unwanted whitespace from translations.  DO NOT MERGE" into gingerbread
am d50b3d13: Merge "Trim unwanted whitespace from translations.  DO NOT MERGE" into gingerbread

Merge commit 'd50b3d1388577370cfe61c34b238cb6c245667a8' into gingerbread-plus-aosp

* commit 'd50b3d1388577370cfe61c34b238cb6c245667a8':
  Trim unwanted whitespace from translations.  DO NOT MERGE
am e1a84b31: (-s ours) am d50b3d13: Merge "Trim unwanted whitespace from translations.  DO NOT MERGE" into gingerbread

Merge commit 'e1a84b31d5945c4690b25d3c86ee82bfa9278bb8'

* commit 'e1a84b31d5945c4690b25d3c86ee82bfa9278bb8':
  Trim unwanted whitespace from translations.  DO NOT MERGE
Trim the Bluetooth database off the main thread.

This looks to be most if not all of the remaining StrictMode
violations in this process.  Not a huge deal, but cleaning up noise
will make bigger problems stand out easier in the future.

Change-Id: I262194c12114114fbe059d73475afb1bbb5654ab
am 0a79bdbb: Trim the Bluetooth database off the main thread.

Merge commit '0a79bdbbfa3b79b808cbbe7490731e5aae4489e9' into gingerbread-plus-aosp

* commit '0a79bdbbfa3b79b808cbbe7490731e5aae4489e9':
  Trim the Bluetooth database off the main thread.
am c24d5e25: am 0a79bdbb: Trim the Bluetooth database off the main thread.

Merge commit 'c24d5e2584346d02fe6a6cabae2ada4cf3e04ee1'

* commit 'c24d5e2584346d02fe6a6cabae2ada4cf3e04ee1':
  Trim the Bluetooth database off the main thread.
Split strings with SD card references into variations.

Change-Id: Ie01f4de45b427f06b0daec3847b865d0e4b2d6e7