Merge commit '990179755525d01a7e005182d8ec04722c7fd396'
* commit '990179755525d01a7e005182d8ec04722c7fd396':
a possible fix for the bug http://b/issue?id=2200637
Merge commit '195a507fc364d249c8ff4d3cd86dea00f383b0aa' into eclair-mr2-plus-aosp
* commit '195a507fc364d249c8ff4d3cd86dea00f383b0aa':
a possible fix for the bug http://b/issue?id=2200637
Merge commit '653d5d415c3447a4250120548bf32d1ee63fe36f'
* commit '653d5d415c3447a4250120548bf32d1ee63fe36f':
Fix issue 2203561: Sholes: audio playing out of earpiece.
Merge commit 'fcae6c71794696a074cabf20beeb02fd87853e30' into eclair-mr2-plus-aosp
* commit 'fcae6c71794696a074cabf20beeb02fd87853e30':
Fix issue 2203561: Sholes: audio playing out of earpiece.
Merge commit '67b692920c18f99b096dce285adc6f7439fa866c' into eclair-mr2
* commit '67b692920c18f99b096dce285adc6f7439fa866c':
Fix issue 2203561: Sholes: audio playing out of earpiece.
Create a new IAudioTrack interface to AudioFlinger when start() fails due to a broken pipe error.
Do the same if start fails due to the same error after time out in obtainBuffer().
Do not indicate that the AudioTrack is started to AudioPolicyManager if IAudioTrack start fails.
This avoids that an AudioTrack keeps a dead IAudioTrack after a media server crash.
Same modifications for AudioRecord.
Add a flag to ToneGenerator indicating that the callback thread can call Java. Without it, when the media server crashes and restarts, the AudioSystem error callback will crash in JNI if the IAudiotrack is created from AudioTrack callback thread.
Merge commit 'dc0f9efd356e5f212c54f87c7a7ddde5d28046d3' into eclair-mr2-plus-aosp
* commit 'dc0f9efd356e5f212c54f87c7a7ddde5d28046d3':
Add tests for Japanization part of vCard.
Merge commit '77e68484f5592e06ca1a881745070f7931641246'
* commit '77e68484f5592e06ca1a881745070f7931641246':
Remove unused field and add new API to control the children drawing order.
Merge commit '05abe8d01d91389b4b52111ed525aa4c4f4e1b71' into eclair-mr2-plus-aosp
* commit '05abe8d01d91389b4b52111ed525aa4c4f4e1b71':
Remove unused field and add new API to control the children drawing order.
Merge commit '131564d26ac5b7f963c60802089b9fe1472659f7' into eclair-mr2
* commit '131564d26ac5b7f963c60802089b9fe1472659f7':
Remove unused field and add new API to control the children drawing order.
Merge commit '122f412a0177c54e32d52a23bf92b78aae4679f7'
* commit '122f412a0177c54e32d52a23bf92b78aae4679f7':
Add support for colored LED on jogball backlight.
Merge commit '76922b8378f235e79fd861ba846bed833199e59f' into eclair-mr2-plus-aosp
* commit '76922b8378f235e79fd861ba846bed833199e59f':
Add support for colored LED on jogball backlight.
Merge commit '9053fdb32b38d1240d856bd6efedf72eefba48d3' into eclair-mr2
* commit '9053fdb32b38d1240d856bd6efedf72eefba48d3':
Add support for colored LED on jogball backlight.
Merge commit 'ffb4eeb54b90659cd95f89268eec47a509690d4c'
* commit 'ffb4eeb54b90659cd95f89268eec47a509690d4c':
Do not update the progress if it is the same as the last given progress.
Merge commit '3613385fbc5368715e7af1a6676b7bb63fafcf09' into eclair-mr2-plus-aosp
* commit '3613385fbc5368715e7af1a6676b7bb63fafcf09':
Do not update the progress if it is the same as the last given progress.
Merge commit 'b1c9068fa4763547ac35e632077ac40456361065'
* commit 'b1c9068fa4763547ac35e632077ac40456361065':
Make sure we relayout the TextView when the text changes and marquee is enabled.
Merge commit '1503f739f8a22822fa969c516564063ef46db52a' into eclair-mr2-plus-aosp
* commit '1503f739f8a22822fa969c516564063ef46db52a':
Make sure we relayout the TextView when the text changes and marquee is enabled.
Merge commit 'e1e0dc8e6eaec052ebb6b88f5b1223075ce5a356' into eclair-mr2
* commit 'e1e0dc8e6eaec052ebb6b88f5b1223075ce5a356':
Make sure we relayout the TextView when the text changes and marquee is enabled.
Merge commit 'ffe9b571bc8f299ac9198e00741c612dbd8d5934'
* commit 'ffe9b571bc8f299ac9198e00741c612dbd8d5934':
Make test compontent support multiple vCard input.
Merge commit 'f035b47774aabf7397aec5c5459ac9860ad63bab' into eclair-mr2-plus-aosp
* commit 'f035b47774aabf7397aec5c5459ac9860ad63bab':
Make test compontent support multiple vCard input.
Merge commit '91fc33004b4c39c736b3b2def79e64cf2b3eb057'
* commit '91fc33004b4c39c736b3b2def79e64cf2b3eb057':
Do not scroll the title bar off screen until the page finishes loading.
Merge commit '925347688d946d9782bc1cfaa95baacd5b630e38' into eclair-mr2-plus-aosp
* commit '925347688d946d9782bc1cfaa95baacd5b630e38':
Do not scroll the title bar off screen until the page finishes loading.
