Merge commit 'ff9c48b3040833c7b3f85bcac116ba5f0dd247d0'
* commit 'ff9c48b3040833c7b3f85bcac116ba5f0dd247d0':
Improve drawing cache speed by selecting the correct opacity and keeping a 32 bits
Merge commit '2f2634e5be65c56f93d3fc3a97e25c546e3bc8bc'
* commit '2f2634e5be65c56f93d3fc3a97e25c546e3bc8bc':
Add group id to getThumbnail and cancelThumbnailRequest API.
Merge commit '2a9b411d4ed60acbe089068c93850ecd049f57f2'
* commit '2a9b411d4ed60acbe089068c93850ecd049f57f2':
Turn some logging back on in ConnectionManager
Merge commit '5a535026bfc1d091c0d029b21cc63f929c2def0a'
* commit '5a535026bfc1d091c0d029b21cc63f929c2def0a':
Make sdk version and code names static finals in PackageParser.
Merge commit '4613007b5755ed95a3a649909b4702400863f9b4'
* commit '4613007b5755ed95a3a649909b4702400863f9b4':
Make VCardComposer create the instance for mHandlerList.
Merge commit 'a1cb6a64c6710d46cc8673bc17db3bdb5c7bbc09'
* commit 'a1cb6a64c6710d46cc8673bc17db3bdb5c7bbc09':
Provide an API for apps to use a dynamic RFCOMM channel and SDP record.
Merge commit '4bc6158d6bdeff796cfd61d489c01db0d203534c'
* commit '4bc6158d6bdeff796cfd61d489c01db0d203534c':
Fix issue #2166755: BroadcastReceiver trying to return result during a non-ordered broadcast
Merge commit 'e1bf39bc764c78344dd2a6c59c5709919bdc1da9'
* commit 'e1bf39bc764c78344dd2a6c59c5709919bdc1da9':
Make sure AsyncTask sens a null result to onPostExecute() when cancelled.
Merge commit '36cad7be504608a538c845b4a44f0dcee157a338'
* commit '36cad7be504608a538c845b4a44f0dcee157a338':
Add cancel() VCardDataBuilder, which is intended to remove
Merge commit 'a4323999ecfaef42c70eec39b6a8f0bfcfaf2394'
* commit 'a4323999ecfaef42c70eec39b6a8f0bfcfaf2394':
Don't reinflate search bar when dialog is already showing
Merge commit '11782b905292ebde1b591f6561913affdfd415fc'
* commit '11782b905292ebde1b591f6561913affdfd415fc':
Extend the date time to handle the case where the
Merge commit '492eb109ff704c0dfec447a88920657cb230b8d6'
* commit '492eb109ff704c0dfec447a88920657cb230b8d6':
Work on issue #2163789: Way too much logging
Merge commit '0200394a0d8da5fd1a34e7366c1e021db8ccb46c'
* commit '0200394a0d8da5fd1a34e7366c1e021db8ccb46c':
bug 2161715: add the .jpg extension to the temp sdcard image file name so MMS can read the JPEG data using a file uri.
Merge commit 'fde23e398e9b880eec6269adf5afaca1f58e58f7'
* commit 'fde23e398e9b880eec6269adf5afaca1f58e58f7':
Fix a null pointer exception caught by the monkey.
Merge commit '9eca703d08ef2ef81796519fdd60a774380c7d4c'
* commit '9eca703d08ef2ef81796519fdd60a774380c7d4c':
setupRedirect() can throw. Catch it and signal the error.
Merge commit '86806ce11a89260147d7c2efa2c192b711d923db'
* commit '86806ce11a89260147d7c2efa2c192b711d923db':
Process synchronous requests in the same RequestQueue.
Merge commit '35b38cefcc92f1ed599a652ac5736ab9e9e75039' into eclair-plus-aosp
* commit '35b38cefcc92f1ed599a652ac5736ab9e9e75039':
Improve drawing cache speed by selecting the correct opacity and keeping a 32 bits
Merge commit '4625758d0b909ccfc9f40b707666b1b21e9e8ffd' into eclair-plus-aosp
* commit '4625758d0b909ccfc9f40b707666b1b21e9e8ffd':
Fix back button handling in ACTV
Merge commit '92b5caa4e21d48db6efeddba532d1546c6e686b1' into eclair-plus-aosp
* commit '92b5caa4e21d48db6efeddba532d1546c6e686b1':
Turn some logging back on in ConnectionManager
Merge commit '5bba632d877c2878384ff21566c8eb6a1a22f37b' into eclair-plus-aosp
* commit '5bba632d877c2878384ff21566c8eb6a1a22f37b':
- hide Entity and all its references
Merge commit '5163cd6d1cb664977eb4473b98657c7e92ae430e' into eclair-plus-aosp
* commit '5163cd6d1cb664977eb4473b98657c7e92ae430e':
Make sdk version and code names static finals in PackageParser.
Merge commit 'ccc214b21edaaddf46960388ec4d3e3ca89a01ae' into eclair-plus-aosp
* commit 'ccc214b21edaaddf46960388ec4d3e3ca89a01ae':
Make VCardComposer create the instance for mHandlerList.
Merge commit '24bb9b8af4ff691538fe9e517e8156016b0da6cd' into eclair-plus-aosp
* commit '24bb9b8af4ff691538fe9e517e8156016b0da6cd':
Provide an API for apps to use a dynamic RFCOMM channel and SDP record.
Merge commit '68d881cf2d2b252f6f795cd64d43e316a1d736e5' into eclair-plus-aosp
* commit '68d881cf2d2b252f6f795cd64d43e316a1d736e5':
Fix issue #2166755: BroadcastReceiver trying to return result during a non-ordered broadcast
Merge commit '89c768435fc48a93c0af97f9f08e57a346b0a9fd' into eclair-plus-aosp
* commit '89c768435fc48a93c0af97f9f08e57a346b0a9fd':
Make sure AsyncTask sens a null result to onPostExecute() when cancelled.
