Merge commit 'fc96523b94ddaad1da39bee0d6861e2186d8479c'
* commit 'fc96523b94ddaad1da39bee0d6861e2186d8479c':
move event log tags used by SyncAdapter into a local .logtags file
Merge commit 'bf0b4da21fc66aed658608ec2861646c280681e2'
* commit 'bf0b4da21fc66aed658608ec2861646c280681e2':
Enable longpress and doubletap to WebKit as touch
Merge commit 'a14b4890b914971c01bf130697090e7e775aeab4'
* commit 'a14b4890b914971c01bf130697090e7e775aeab4':
Check that the resolved activity is not in our package.
Merge commit 'b23806b92f8f5e19a7a73380da4689607c4d4e49'
* commit 'b23806b92f8f5e19a7a73380da4689607c4d4e49':
Pass a message to move the focus when user hits "Next".
Merge commit '7cd4029473431c56100e52f631b9733829dc3171' into eclair-mr2-plus-aosp
* commit '7cd4029473431c56100e52f631b9733829dc3171':
Add convenience function to MediaStore to move a playlist item
Merge commit '328c0e7986aa6bb7752ec6de3da9c999920bb55f' into eclair-mr2-plus-aosp
* commit '328c0e7986aa6bb7752ec6de3da9c999920bb55f':
- removed the concept of Entity from the ContentProvider APIs
Merge commit 'b3c1f1cff4ecf5c88a0bd00d421beeb022bb41e4' into eclair-mr2-plus-aosp
* commit 'b3c1f1cff4ecf5c88a0bd00d421beeb022bb41e4':
move event log tags used by SyncAdapter into a local .logtags file
Merge commit '274b8c584161342af2d1f6dc616995d98f6796ad'
* commit '274b8c584161342af2d1f6dc616995d98f6796ad':
Fix the build when ViewDebug.TRACE_RECYCLER is set to true.
Merge commit 'eb68a226563f60265663f1688dda77c4f909e5de'
* commit 'eb68a226563f60265663f1688dda77c4f909e5de':
Add bindService API to not bring ot foreground.
Merge commit '774568f73911ae2bb35c816a40d49376ea8300df'
* commit '774568f73911ae2bb35c816a40d49376ea8300df':
Close popup when Keyboard gets a CANCEL motion event.
Merge commit '506afbd600d82a324f59ceb875f664ead4338600'
* commit '506afbd600d82a324f59ceb875f664ead4338600':
Remove the code where we suspect webkit draw during
Merge commit '8f4bca2acada86c36c7de59e8891ef120098aa19'
* commit '8f4bca2acada86c36c7de59e8891ef120098aa19':
Improve exception message thrown when a View's state is of the wrong type.
Merge commit '9f1ea0d47f5aa18cf949593e6bfd36af9c6a55be'
* commit '9f1ea0d47f5aa18cf949593e6bfd36af9c6a55be':
Some fixes for positioning the WebTextView.
Merge commit '45ccb6a55e0c3ec23a5bbf710d0d170bc39985ed'
* commit '45ccb6a55e0c3ec23a5bbf710d0d170bc39985ed':
Switching from activity based full screen plugins to a view system overlay.
Merge commit '15650af4ab1df7fb84839162f9409d88cb4a3ccc'
* commit '15650af4ab1df7fb84839162f9409d88cb4a3ccc':
Updating list of standard Intents in android.content.Intent
Merge commit '90073aadd5dfdbb0e7ca9b53ae086536f976793f'
* commit '90073aadd5dfdbb0e7ca9b53ae086536f976793f':
Document that some parameters will not be null and fix getSupportedPictureFormats.
Merge commit '159f0015418955501d8cf2744b0393db2e73f394' into eclair-mr2-plus-aosp
* commit '159f0015418955501d8cf2744b0393db2e73f394':
Allow resource and file URIs in ImageView.setImageURI()
Merge commit '45e77ce36ae1d26bcf35afb1f7662d7b6fb08212' into eclair-mr2-plus-aosp
* commit '45e77ce36ae1d26bcf35afb1f7662d7b6fb08212':
Use unbundled QSB for global search
Merge commit '7cd4029473431c56100e52f631b9733829dc3171' into eclair-mr2-plus-aosp
* commit '7cd4029473431c56100e52f631b9733829dc3171':
Add convenience function to MediaStore to move a playlist item
Merge commit '5f68d6fafc29bb14b4b407b4221395332409fc9c' into eclair-mr2-plus-aosp
* commit '5f68d6fafc29bb14b4b407b4221395332409fc9c':
Enable longpress and doubletap to WebKit as touch
Merge commit '328c0e7986aa6bb7752ec6de3da9c999920bb55f' into eclair-mr2-plus-aosp
* commit '328c0e7986aa6bb7752ec6de3da9c999920bb55f':
- removed the concept of Entity from the ContentProvider APIs
Merge commit 'a50d450863cb84805ac6809a4c1f7b83984da1ee' into eclair-mr2-plus-aosp
* commit 'a50d450863cb84805ac6809a4c1f7b83984da1ee':
Check that the resolved activity is not in our package.
Merge commit '47fabbfcbf99e5e3b73a6ee09059c77932ef1b7b' into eclair-mr2-plus-aosp
* commit '47fabbfcbf99e5e3b73a6ee09059c77932ef1b7b':
Pass a message to move the focus when user hits "Next".
Merge commit '7b935e84264fa1cfe36a1fa9f8cb5954d09cb9ef' into eclair-mr2-plus-aosp
* commit '7b935e84264fa1cfe36a1fa9f8cb5954d09cb9ef':
Fix the build when ViewDebug.TRACE_RECYCLER is set to true.
Merge commit 'b882b361f123e4ef7870c99e8a9fd9e1be48e396' into eclair-mr2-plus-aosp
* commit 'b882b361f123e4ef7870c99e8a9fd9e1be48e396':
Deleted Gmail.java from frameworks. Previously it had been moved to vendor/google/.../Gmail/...
Merge commit 'af9788a9d6c238dd97f40dc020e036739daf0811' into eclair-mr2-plus-aosp
* commit 'af9788a9d6c238dd97f40dc020e036739daf0811':
Add bindService API to not bring ot foreground.
Merge commit '1ee7b6453aaae47a6493a97790b9483aca1556c9' into eclair-mr2-plus-aosp
* commit '1ee7b6453aaae47a6493a97790b9483aca1556c9':
Close popup when Keyboard gets a CANCEL motion event.
Merge commit 'a5ba0a78811fcd5d3470bfa09df3e0106b77567e' into eclair-mr2-plus-aosp
* commit 'a5ba0a78811fcd5d3470bfa09df3e0106b77567e':
Make sure to acknowledge stale broadcasts
Merge commit '3f40bd48d278a40603f3f7d7b9d602ecbc09246d' into eclair-mr2-plus-aosp
* commit '3f40bd48d278a40603f3f7d7b9d602ecbc09246d':
Remove the code where we suspect webkit draw during
Merge commit '06ffc12a398bf16fb360d74b7511d946a73a741e' into eclair-mr2-plus-aosp
* commit '06ffc12a398bf16fb360d74b7511d946a73a741e':
Improve exception message thrown when a View's state is of the wrong type.
Merge commit '6be3bf2393030549306b438b9b17085035729135' into eclair-mr2-plus-aosp
* commit '6be3bf2393030549306b438b9b17085035729135':
Some fixes for positioning the WebTextView.
Merge commit 'f7d0b01387c10f93bf17981d45087810c80f0902' into eclair-mr2-plus-aosp
* commit 'f7d0b01387c10f93bf17981d45087810c80f0902':
Add TrafficStats class to SDK.