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 '0b3977f87b10fd78cffa0c39aaf787bfe6d108c7' into eclair-mr2-plus-aosp
* commit '0b3977f87b10fd78cffa0c39aaf787bfe6d108c7':
add "junk path" -k option to aapt (DO NOT MERGE)
Merge commit '1e23a4019a2782054fc2c72f243008e29e13b411' into eclair-mr2-plus-aosp
* commit '1e23a4019a2782054fc2c72f243008e29e13b411':
do not merge: The qcom video decoders always output yuv data after adjusting dimensions to be a multiple of 16.
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.
Merge commit 'a86f1ccca0bf54f27c398b4dbb0f2f1ec7293315' into eclair-mr2-plus-aosp
* commit 'a86f1ccca0bf54f27c398b4dbb0f2f1ec7293315':
Add a new API for initing Wifi multicast filtering
Merge commit '54616f3435e67029006d2f77462c61ed0635a3f6' into eclair-mr2-plus-aosp
* commit '54616f3435e67029006d2f77462c61ed0635a3f6':
Make MockCursor class a part of public SDK.
Merge commit 'bfd5b38673212c47f0e386c0a8370d4ff47bd2fe' into eclair-mr2-plus-aosp
* commit 'bfd5b38673212c47f0e386c0a8370d4ff47bd2fe':
Some cleanup of OMXCodec code, make sure to ignore 0-length output buffers in the metadata retriever.
Added setVoiceVolume() method to AudioSystem, AudioFlinger, IAudioFlinger, AudioPolicyService.
Removed call to AudioHardwareInterface::setVoiceVolume() from AudioFlinger::setStreamVolume().
Merge commit '3f9faf473712be7d6471913b921bf8a63ab3205d' into eclair-mr2-plus-aosp
* commit '3f9faf473712be7d6471913b921bf8a63ab3205d':
When WebView has wrap_content, we are sending WebKit
Merge commit '2f3dc5b9ce0e3907e529c88728b166d66beccab5' into eclair-mr2-plus-aosp
* commit '2f3dc5b9ce0e3907e529c88728b166d66beccab5':
Draw dividers between <optgroup> and <option> elements.
Merge commit '7a7197853de1b8aea0945b5b72e0eb12b2837b50' into eclair-mr2-plus-aosp
* commit '7a7197853de1b8aea0945b5b72e0eb12b2837b50':
fix multiple text areas, and text areas without focus rings
Without the size checks it's possible for calls to glBufferData
and glBufferSubData to read off the end of the Buffer object's
data, which can cause page faults.
Fix end-of-line characters for the "spec" files. (That's why
every line of these files is changed.)
Enhance our code emitter to properly handle bounds checks for
possibly-null pointers.
Merge commit 'a8da17356f9a385e097e3eef205358462d214538' into eclair-mr2-plus-aosp
* commit 'a8da17356f9a385e097e3eef205358462d214538':
Do not show radio/checkboxes for <optgroup> labels.
Merge commit '8785c064fab3429c792ac160aeeb19e9926382f0' into eclair-mr2-plus-aosp
* commit '8785c064fab3429c792ac160aeeb19e9926382f0':
Let PLUS occur once anywhere in dial-str network portion.
* 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 '2a2805b7fbd25ee11ad554e33bf34dbb2e8b71c5' into eclair-mr2-plus-aosp
* commit '2a2805b7fbd25ee11ad554e33bf34dbb2e8b71c5':
It turns out to be useful to allow enumeration on a per-tag basis,
* 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 '5af4cf47b94383deb47648240036c7090f46fd41' into eclair-mr2-plus-aosp
* commit '5af4cf47b94383deb47648240036c7090f46fd41':
add dpad control of text selection for sholes
Merge commit '32de91306233b08604ce7a158a37235c7042ae13' into eclair-mr2-plus-aosp
* commit '32de91306233b08604ce7a158a37235c7042ae13':
Fix high density bug 2179543: use 'dip' instead of 'px'
