Merge commit '34b6a27ea38adeea54a488efc6bbd04c58cb8a91' into eclair-plus-aosp
* commit '34b6a27ea38adeea54a488efc6bbd04c58cb8a91':
re-enable cancelation of the sync thread upon receipt of ISyncAdapter.cancelSync()
Merge commit 'e23ef1023a4e4bd91a68c41c81ba273656a2c3a7' into eclair-plus-aosp
* commit 'e23ef1023a4e4bd91a68c41c81ba273656a2c3a7':
Add error output to pm for FAILED_MISSING_FEATURE
Merge commit '0f44220b34e346ef333cdb4cd4b4903b5212dad2' into eclair-plus-aosp
* commit '0f44220b34e346ef333cdb4cd4b4903b5212dad2':
Prevent ListView from scrolling/flinging its content when the content fits on screen.
Previously we had been setting the imageSize parameter to 0, which was
incorrect. According to the OpenGL ES spec for glCompressedTexImage2D
this parameter should be the size in bytes of the compressed data.
Merge commit 'ec5d9fb47d180d84e3eff0b2138966579be6ac00' into eclair-plus-aosp
* commit 'ec5d9fb47d180d84e3eff0b2138966579be6ac00':
Revert "- don't schedule syncs that we will never dispatch"
Merge commit 'c91ad28ff9173971c1d886f884250b1e774a40a6' into eclair-plus-aosp
* commit 'c91ad28ff9173971c1d886f884250b1e774a40a6':
Fix property being cleared when DeviceFound signal is received.
Merge commit 'bf1071c07979b03a9f5e8281aba82ed05513185e' into eclair-plus-aosp
* commit 'bf1071c07979b03a9f5e8281aba82ed05513185e':
Temporarily unlock our mutex while fetching a buffer from the upstream source.
Merge commit '450ff8a48c9b78729332c99d680560b583f17e7d' into eclair-plus-aosp
* commit '450ff8a48c9b78729332c99d680560b583f17e7d':
Fix double-free problem in EmojiFactory.
Merge commit '6896aef0bd3132a64cfdee6c1276c4bbbb25d8e3' into eclair-plus-aosp
* commit '6896aef0bd3132a64cfdee6c1276c4bbbb25d8e3':
Clean TTS logs: use a common TAG in the TTS service, don't show
Merge commit '10f8f11106ccf492e15ee2a6ba2be99ec4578088' into eclair-plus-aosp
* commit '10f8f11106ccf492e15ee2a6ba2be99ec4578088':
Fix replacement-after-add of resource files in overlay.
Merge commit 'cedcb13547d3c65091ca12b1f69be563af442eb1' into eclair-plus-aosp
* commit 'cedcb13547d3c65091ca12b1f69be563af442eb1':
Use Email.TYPE_MOBILE
Merge commit '7cb08accdd923e05518f4bacd103bfe68d589e5d' into eclair-plus-aosp
* commit '7cb08accdd923e05518f4bacd103bfe68d589e5d':
- don't schedule syncs that we will never dispatch
Aapt was adding/removing elements from a list an continuing to use a stale copy for future indexes.
This could cause incorrect subsequent processing. Add an en resource and modify an es, for example.
Adding the en would cause the base fileset's es version to be moved in the list. Using the old index
we'd then attempt to remove the old es version with the wrong index and then add the new es version
generating a "duplicate file" error.
bug: 2090015
Merge commit '3e59cf7ede6d6c66cbb0b1e1f345cf132972a713' into eclair-plus-aosp
* commit '3e59cf7ede6d6c66cbb0b1e1f345cf132972a713':
Set RFCOMM SO_SNDBUF size to 70 KB for large RFCOMM writes.
