Merge commit 'f8e3ac851959efbd21da930a802f8efb65ccec5b' into eclair-plus-aosp
* commit 'f8e3ac851959efbd21da930a802f8efb65ccec5b':
In onKeyUp for DPAD_CENTER, show the IME for text input.
Merge commit '2cb6b7fb868899a3c718280605b0e462d0f8491f' into eclair-plus-aosp
* commit '2cb6b7fb868899a3c718280605b0e462d0f8491f':
Import revised translations. DO NOT MERGE
Merge commit '785768a9216b3a631237587feffea2aeb05a91cc' into eclair-plus-aosp
* commit '785768a9216b3a631237587feffea2aeb05a91cc':
Prevent transparent region from getting out of sync with Surface Flinger
Merge commit '6270d52c0dded8658733a392f3ef1f521bc5dbee' into eclair-plus-aosp
* commit '6270d52c0dded8658733a392f3ef1f521bc5dbee':
Disable known failure math tanhd tests (DO NOT MERGE)
Merge commit '5b48223d0e8b8becea0c120895d964e6472b3552' into eclair-plus-aosp
* commit '5b48223d0e8b8becea0c120895d964e6472b3552':
If we fail to persist the current settings and fall back to the back settings file
* changes:
If we fail to persist the current settings and fall back to the back settings file when reading settings in PackageManager, we might rename the corrupted settings to backup(in case of power failure between the earlier write failure and file deletion) and end up loosing both files. So just clear up the corrupted current settings file if we have backup. The backup wouldn't exist if everything went well with persisting the earlier settings.
Merge commit '617262d8f57362536ddc00a070c1c0994741de44' into eclair-plus-aosp
* commit '617262d8f57362536ddc00a070c1c0994741de44':
add "junk path" -k option to aapt (DO NOT MERGE)
Merge commit 'ca404dfb920ab009cef4db5e74715b796f79b3f9' into eclair-plus-aosp
* commit 'ca404dfb920ab009cef4db5e74715b796f79b3f9':
do not merge: The qcom video decoders always output yuv data after adjusting dimensions to be a multiple of 16.
Merge commit 'cdc8b326dd0989003e2fdd7d5a605b5755acf221' into eclair-plus-aosp
* commit 'cdc8b326dd0989003e2fdd7d5a605b5755acf221':
Fix high density bug 2179543: use 'dip' instead of 'px'
Merge commit 'd7786b41b78ba8592daea708b024b5a75e441992' into eclair-plus-aosp
* commit 'd7786b41b78ba8592daea708b024b5a75e441992':
Power Manager support for light sensor backlight management.
Merge commit 'cea8f8e4a8506678c0255763f46d1f6577f991a1' into eclair-plus-aosp
* commit 'cea8f8e4a8506678c0255763f46d1f6577f991a1':
Log exception if we hit an error parsing an incoming SMS message.
Merge commit 'b34d5d527596102ae7a040d787e4d8c336bf192b' into eclair-plus-aosp
* commit 'b34d5d527596102ae7a040d787e4d8c336bf192b':
Use the TLS register if HAVE_ARM_TLS_REGISTER is defined
Merge commit 'f37447bad3773b62176baa837908daf6edb44273' into eclair-plus-aosp
* commit 'f37447bad3773b62176baa837908daf6edb44273':
Proper fix for zero signal strength and no_service. Fixes#2176141
Merge commit 'b5d69242d10021f82632d62c30b1ce63785c9386' into eclair-plus-aosp
* commit 'b5d69242d10021f82632d62c30b1ce63785c9386':
Update 5.xml with last minute changes.
Merge commit 'ae26b8b6f40ad037927bf02ffd47953001c2cb3b' into eclair
* commit 'ae26b8b6f40ad037927bf02ffd47953001c2cb3b':
Update 5.xml with last minute changes.
Merge commit '639d69fe8799ac2fa0bbf7560229531377ccc0f4' into eclair-plus-aosp
* commit '639d69fe8799ac2fa0bbf7560229531377ccc0f4':
one step towards fixing [2071412] work around mdp 32-bits fade limitation
Merge commit '007a429f09fb9e4e4fbd4205d03878874c9f7957' into eclair-plus-aosp
* commit '007a429f09fb9e4e4fbd4205d03878874c9f7957':
Update 5.xml with last minute changes.
Merge commit '445c05c4849c960bb43f73a0390e62dc73991da6' into eclair-plus-aosp
* commit '445c05c4849c960bb43f73a0390e62dc73991da6':
docs: fix doc error in dialog example snippet (no not merge)
Merge commit 'f3bc5349b20f642f798c2b96d7bf7c05c2af998f' into eclair
* commit 'f3bc5349b20f642f798c2b96d7bf7c05c2af998f':
docs: fix doc error in dialog example snippet (no not merge)
Merge commit 'f585be7f373ad7920a7c486f84cc38b86e3572b7' into eclair-plus-aosp
* commit 'f585be7f373ad7920a7c486f84cc38b86e3572b7':
A few more testcases for the vendor to reproduce issues with their decoder. Not part of the shipping image.
Merge commit 'da2ecbebd226a0fbc5ed881c541b9126d30f9007' into eclair-plus-aosp
* commit 'da2ecbebd226a0fbc5ed881c541b9126d30f9007':
1) Add 10 seconds wait time before collecting the end memory.
