Merge commit '940bc05b38f5295b31fb80e820a98e32200e492f'
* commit '940bc05b38f5295b31fb80e820a98e32200e492f':
Modify the behavior of createThumbnailForEXIF() to:
Merge commit '653d5d415c3447a4250120548bf32d1ee63fe36f'
* commit '653d5d415c3447a4250120548bf32d1ee63fe36f':
Fix issue 2203561: Sholes: audio playing out of earpiece.
Merge commit '97f96ef9f795e0fe0058251bd696fb4a4d747d3c' into eclair-mr2-plus-aosp
* commit '97f96ef9f795e0fe0058251bd696fb4a4d747d3c':
Modify the behavior of createThumbnailForEXIF() to:
Merge commit 'fcae6c71794696a074cabf20beeb02fd87853e30' into eclair-mr2-plus-aosp
* commit 'fcae6c71794696a074cabf20beeb02fd87853e30':
Fix issue 2203561: Sholes: audio playing out of earpiece.
* changes:
Modify the behavior of createThumbnailForEXIF() to: returning SizedThumbnailBitmap, which contains the downsampled bitmap either from the thumbnail in EXIF or the full image.
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 'c526e5d57b4f700370c7204e112e4e231aa3c482'
* commit 'c526e5d57b4f700370c7204e112e4e231aa3c482':
Explicitly specify that online-sdk depends on framework-res. (do not merge)
Merge commit '9d45108a5f341f426d2e5472e6c9319b8e482748'
* commit '9d45108a5f341f426d2e5472e6c9319b8e482748':
Fix#2176803 - restores from userdebug to user builds not working
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 '35ea90deee5050a66909b2740601bd81f9f29780' into eclair-mr2-plus-aosp
* commit '35ea90deee5050a66909b2740601bd81f9f29780':
Explicitly specify that online-sdk depends on framework-res. (do not merge)
Merge commit '888b702c81b21847b19c4e2845686ed35cc03a0e' into eclair-mr2-plus-aosp
* commit '888b702c81b21847b19c4e2845686ed35cc03a0e':
Fix#2176803 - restores from userdebug to user builds not working
Merge commit 'b5e380a799b1c22d51364a2b9b3abe02e2eb83cf' into eclair-mr2
* commit 'b5e380a799b1c22d51364a2b9b3abe02e2eb83cf':
Explicitly specify that online-sdk depends on framework-res. (do not merge)
Merge commit '595596fe6b6fd52bf26d224f18b8724a4d151316' into eclair-mr2
* commit '595596fe6b6fd52bf26d224f18b8724a4d151316':
Fix#2176803 - restores from userdebug to user builds not working
Merge commit 'e33044eadfa9969e71e50d1aff165cbc436b13f3' into eclair
* commit 'e33044eadfa9969e71e50d1aff165cbc436b13f3':
Explicitly specify that online-sdk depends on framework-res. (do not merge)
