Merge commit 'febb94cdbb7c7b7091401d21824bfab32b9daca5' into eclair-mr2
* commit 'febb94cdbb7c7b7091401d21824bfab32b9daca5':
Make standard roaming indicator display indications configurable
Merge commit '6d02f3f3ff1962bdcf2a1dcd86b433c9614c3d84' into eclair-mr2
* commit '6d02f3f3ff1962bdcf2a1dcd86b433c9614c3d84':
Reduce the amount of EriManager Logging.
Merge commit '98b3def2983e78409002cf406574bbc8eeef8bfd' into eclair-mr2
* commit '98b3def2983e78409002cf406574bbc8eeef8bfd':
Revert "egl: temporarily also include eglTerminate->eglInitialize hack for 8k"
Merge commit 'd301c90446644f63cda9b9263f83332676065bb4' into eclair-mr2
* commit 'd301c90446644f63cda9b9263f83332676065bb4':
Delay 500ms between each registering each SDP record using sdptool.
Merge commit 'f836acf241f10d943d72d439fa425fda73a6d56b' into eclair-mr2
* commit 'f836acf241f10d943d72d439fa425fda73a6d56b':
Fix issue #2179931: Power key to wake up frequently ignored when in dock app
Merge commit '6dc3f4e553d333b9f115a222a9a684bb2aa55b5e' into eclair-mr2
* commit '6dc3f4e553d333b9f115a222a9a684bb2aa55b5e':
Now that Eclair has been defined as API revision 5 mark Build.VERSION_CODES.ECLAIR as such.
Merge commit 'ee110be02256b816ac6d863e39cb8b11b8071baa' into eclair-mr2
* commit 'ee110be02256b816ac6d863e39cb8b11b8071baa':
Fix issue #2179891: Need to update 5.xml
Merge commit 'c08efb2712fbcc25ce9c208f3c9d7c0935e209d4' into eclair-mr2
* commit 'c08efb2712fbcc25ce9c208f3c9d7c0935e209d4':
Import revised translations. DO NOT MERGE
Merge commit '98e0b146b80670b52805b4b210ef5582dad6bb68' into eclair-mr2
* commit '98e0b146b80670b52805b4b210ef5582dad6bb68':
Make PhoneStateListeners not call TelephonyManager
Merge commit '6903d5cedcffa005818c497f672cf16c2dff619c' into eclair-mr2
* commit '6903d5cedcffa005818c497f672cf16c2dff619c':
Add LAST_KMSG_KB variable, used to tune the size of /proc/last_kmsg uploads.
Merge commit 'ad60e7fe2c9588cd16c1351419af90964beb232d' into eclair-mr2
* commit 'ad60e7fe2c9588cd16c1351419af90964beb232d':
Fix for 2177367: Reduce duration of vibrate in RotaryLockScreen
Merge commit '2c6c5e6e49795e6e24cd089c9018377d837ba931' into eclair-mr2
* commit '2c6c5e6e49795e6e24cd089c9018377d837ba931':
Fix issue #2176944: Need API so browser, others can determine memory size of device
Merge commit 'e6ee3be1c254404dad842298f6f56c11cc6c7ac8' into eclair-mr2
* commit 'e6ee3be1c254404dad842298f6f56c11cc6c7ac8':
BT API security audit: fix a couple of permission mistakes.
Merge commit '846322a9ae5ef8155cca0059d3f64d718516ca13' into eclair-mr2
* commit '846322a9ae5ef8155cca0059d3f64d718516ca13':
add a way to easily catch and log GL errors (compile time flag)
Merge commit 'aaa6299bcd1a44f5f066ef48fb99cc0a704cbd0f' into eclair-mr2
* commit 'aaa6299bcd1a44f5f066ef48fb99cc0a704cbd0f':
Import revised translations. DO NOT MERGE
Merge commit 'ea11027401a6b0e8fc351b7585d929e8fdb3fd08' into eclair-mr2
* commit 'ea11027401a6b0e8fc351b7585d929e8fdb3fd08':
Import revised translations. DO NOT MERGE
Merge commit '348b92bd513087369ac682e29620d7829fa1381b' into eclair-mr2
* commit '348b92bd513087369ac682e29620d7829fa1381b':
GPS: Fix problem with SUPL when SUPL APN is already active.
Merge commit 'ff94720b8bf9f83f326197cb0cb27576168e9448' into eclair-mr2
* commit 'ff94720b8bf9f83f326197cb0cb27576168e9448':
Fix issue 2174002: After rejecting Call when device ringtone is mute and playing music, audio is not transfered to BT device.
