Merge commit 'f57b07dfa82aba5397e54d741ce6de0d1dcd73c9'
* commit 'f57b07dfa82aba5397e54d741ce6de0d1dcd73c9':
Make stagefright a little less verbose. Fix heap corruption for real.
Merge commit 'ad28543022101d0b01845e3f53dcd57e524816ef' into eclair-mr2-plus-aosp
* commit 'ad28543022101d0b01845e3f53dcd57e524816ef':
Make stagefright a little less verbose. Fix heap corruption for real.
Merge commit '1f04c83684cb1a0f1e5cc6100294d6c3bbb65d4c'
* commit '1f04c83684cb1a0f1e5cc6100294d6c3bbb65d4c':
Still don't know why the heap gets corrupted, but not deleting the OMXNodeInstance appears to prevent this from happening.
Merge commit 'bae0d0d4c770bbd21a0b2763fa0ddb7cf6613476'
* commit 'bae0d0d4c770bbd21a0b2763fa0ddb7cf6613476':
Fix 2209967 Tonegenerator: mutex not release in startTone() upon timeout waiting for the stop sequence to complete.
Merge commit '6e6dbc3f4dadb844b472529f51e356fd1bdc1aaa'
* commit '6e6dbc3f4dadb844b472529f51e356fd1bdc1aaa':
Do not hide the cursor ring when clicking on an input field.
Merge commit '1f64ffe2e486b5a0d0c77487bdb612ee46ed7ead' into eclair-mr2-plus-aosp
* commit '1f64ffe2e486b5a0d0c77487bdb612ee46ed7ead':
Still don't know why the heap gets corrupted, but not deleting the OMXNodeInstance appears to prevent this from happening.
Merge commit '470687e251ecb298bda17f3e3978ffeaf05622a9' into eclair-mr2-plus-aosp
* commit '470687e251ecb298bda17f3e3978ffeaf05622a9':
Fix 2209967 Tonegenerator: mutex not release in startTone() upon timeout waiting for the stop sequence to complete.
Merge commit '1d60c5c16b92ddc64d10f13da8af7faaae22cd2f' into eclair-mr2-plus-aosp
* commit '1d60c5c16b92ddc64d10f13da8af7faaae22cd2f':
Do not hide the cursor ring when clicking on an input field.
While our hardware decoders clearly outperform the software decoders in terms
of raw throughput, their startup latency makes them less suitable for thumbnail
extraction.
Merge commit 'dd28d56368441537ec5eb42150516416fdbf10ad' into eclair-mr2
* commit 'dd28d56368441537ec5eb42150516416fdbf10ad':
Fix 2209967 Tonegenerator: mutex not release in startTone() upon timeout waiting for the stop sequence to complete.
When pressing the trackball on a text input field, do not call
setFollowedLink, which results in the cursor ring disappearing and
the WebTextView being torn down. Fixes http://b/issue?id=2210127
Merge commit '5c73c3bce410aa84bc0c57eee5b394c044035e33'
* commit '5c73c3bce410aa84bc0c57eee5b394c044035e33':
Make the VideoView go away automatically at the end of playback.
Merge commit '46a83b4ead517b9fc13b4bee4c59c3eaf4d3fdd9' into eclair-mr2-plus-aosp
* commit '46a83b4ead517b9fc13b4bee4c59c3eaf4d3fdd9':
Make the VideoView go away automatically at the end of playback.
Merge commit 'c6bead14fe6fe70bcfd8802ee9f0259476a074ce' into eclair-mr2-plus-aosp
* commit 'c6bead14fe6fe70bcfd8802ee9f0259476a074ce':
Implement feature #2117336: Create event communication APIs for live wallpaper
Merge commit '7580493b014a2c7ea883cd291255798dc72ebbff' into eclair-mr2
* commit '7580493b014a2c7ea883cd291255798dc72ebbff':
Implement feature #2117336: Create event communication APIs for live wallpaper
Merge commit '52ab52f35b9b6be78b818f377608c18d97f137ce'
* commit '52ab52f35b9b6be78b818f377608c18d97f137ce':
Update the names of the widgets when the locale changes.
Merge commit '7453da3f420b74f5bb135d5895b82dca9c015bb3'
* commit '7453da3f420b74f5bb135d5895b82dca9c015bb3':
Extract video thumbnails from the largest sync sample among the first 20.
Merge commit '36cf8123d8cf9047c64633a963706f40cecc0bb1'
* commit '36cf8123d8cf9047c64633a963706f40cecc0bb1':
PowerManager: Don't poke user activity in setKeyboardVisibility unless the state actually changed.
Merge commit 'fa48000a25a32de1a117c716dcd6f9c255bffe58' into eclair-mr2-plus-aosp
* commit 'fa48000a25a32de1a117c716dcd6f9c255bffe58':
Update the names of the widgets when the locale changes.
Merge commit '94f2c524214b56ac2416f79cf9e81fa598327917' into eclair-mr2
* commit '94f2c524214b56ac2416f79cf9e81fa598327917':
Update the names of the widgets when the locale changes.
