Merge commit 'f14da417f3cb1f80a62732238623bb83173255c0' into eclair-mr2
* commit 'f14da417f3cb1f80a62732238623bb83173255c0':
Send "encoding problem" to the network for general errors during SMS dispatch.
Merge commit 'eadb97b4826bb6a2fa34db9c65b5a0d6f7baade9' into eclair-mr2
* commit 'eadb97b4826bb6a2fa34db9c65b5a0d6f7baade9':
PowerManagerService: Ignore user activity while the screen is animating off.
Merge commit '0737b1643071694cf8767e3609ad628f1679d63a' into eclair-mr2
* commit '0737b1643071694cf8767e3609ad628f1679d63a':
Fix bug 2194213: Non-default system IMEs are enabled, but not initially shown in input method switcher.
Merge commit 'f702f1f33fb5490854579a1f5ce61c70ea7fd768' into eclair-mr2
* commit 'f702f1f33fb5490854579a1f5ce61c70ea7fd768':
Make FWK start a wifi scan if supplicant forgets. (do not merge)
Merge commit 'b0e6a9a0e6e82327f52fd25f3a9e2463ff591905' into eclair-mr2
* commit 'b0e6a9a0e6e82327f52fd25f3a9e2463ff591905':
Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers.
Merge commit 'f8e3ac851959efbd21da930a802f8efb65ccec5b' into eclair-mr2
* commit 'f8e3ac851959efbd21da930a802f8efb65ccec5b':
In onKeyUp for DPAD_CENTER, show the IME for text input.
Merge commit '2cb6b7fb868899a3c718280605b0e462d0f8491f' into eclair-mr2
* commit '2cb6b7fb868899a3c718280605b0e462d0f8491f':
Import revised translations. DO NOT MERGE
Merge commit '785768a9216b3a631237587feffea2aeb05a91cc' into eclair-mr2
* commit '785768a9216b3a631237587feffea2aeb05a91cc':
Prevent transparent region from getting out of sync with Surface Flinger
Merge commit '6270d52c0dded8658733a392f3ef1f521bc5dbee' into eclair-mr2
* commit '6270d52c0dded8658733a392f3ef1f521bc5dbee':
Disable known failure math tanhd tests (DO NOT MERGE)
Merge commit '5b48223d0e8b8becea0c120895d964e6472b3552' into eclair-mr2
* commit '5b48223d0e8b8becea0c120895d964e6472b3552':
If we fail to persist the current settings and fall back to the back settings file
Merge commit '617262d8f57362536ddc00a070c1c0994741de44' into eclair-mr2
* commit '617262d8f57362536ddc00a070c1c0994741de44':
add "junk path" -k option to aapt (DO NOT MERGE)
Merge commit 'ca404dfb920ab009cef4db5e74715b796f79b3f9' into eclair-mr2
* commit 'ca404dfb920ab009cef4db5e74715b796f79b3f9':
do not merge: The qcom video decoders always output yuv data after adjusting dimensions to be a multiple of 16.
* changes:
Fix bug 2194213: Non-default system IMEs are enabled, but not initially shown in input method switcher. - Ensure system IMEs are put on the enabled list at startup/install. - If the default IME is not installed, choose another one whenever building input method list.
* 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.
* changes:
It turns out to be useful to allow enumeration on a per-tag basis, and it's easy to support based on the data structures we have, so add a tag parameter to getNextEvent().
Merge commit 'cdc8b326dd0989003e2fdd7d5a605b5755acf221' into eclair-mr2
* commit 'cdc8b326dd0989003e2fdd7d5a605b5755acf221':
Fix high density bug 2179543: use 'dip' instead of 'px'
