Merge commit 'db8585402f6b4ca219d5d73735a11cee115f50b7'
* commit 'db8585402f6b4ca219d5d73735a11cee115f50b7':
Now that UseBuffer on this component is fixed, let's use it.
Merge commit 'c3c2f76682151c5051a02269b1990b6644a9074c'
* commit 'c3c2f76682151c5051a02269b1990b6644a9074c':
New live wallpaper API to expose author and description strings.
Merge commit '0fb041f364355c438eb7d508eb7fa7946418cd11'
* commit '0fb041f364355c438eb7d508eb7fa7946418cd11':
remove the SubscribedFeedsProvider since it has been moved to vendor/google
Merge commit '2fe3e3a771c0ea78ca9d88ffa6739396d38d61a6' into eclair-mr2-plus-aosp
* commit '2fe3e3a771c0ea78ca9d88ffa6739396d38d61a6':
Now that UseBuffer on this component is fixed, let's use it.
Merge commit '1bca7612dfeb78bba91f3985fb6f3567daf13a57' into eclair-mr2-plus-aosp
* commit '1bca7612dfeb78bba91f3985fb6f3567daf13a57':
New live wallpaper API to expose author and description strings.
Merge commit '3266c5f125be34aae0f50e0e3397b14d9a603ad0' into eclair-mr2-plus-aosp
* commit '3266c5f125be34aae0f50e0e3397b14d9a603ad0':
remove the SubscribedFeedsProvider since it has been moved to vendor/google
Merge commit '818a9cf827f282addbf7c8ee23534e08a3aaa358' into eclair-mr2
* commit '818a9cf827f282addbf7c8ee23534e08a3aaa358':
Now that UseBuffer on this component is fixed, let's use it.
Merge commit 'eca41b31fb9a5202f755bfd9dbc4849dbb486137' into eclair-mr2
* commit 'eca41b31fb9a5202f755bfd9dbc4849dbb486137':
New live wallpaper API to expose author and description strings.
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 '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.
