Merge commit 'f2b0fb8c913cb3504f24e04be2221b81979b0cb3'
* commit 'f2b0fb8c913cb3504f24e04be2221b81979b0cb3':
Fix for #2092883: Allow manual sync even when background data is disabled
Merge commit 'e10bbc50a69201d2dd61b414ffd77cf2a6bc2dca'
* commit 'e10bbc50a69201d2dd61b414ffd77cf2a6bc2dca':
Allow only System Service to send most Bluetooth intents.
Merge commit '21da33570278762d7e9375b83eb74130bf82728d'
* commit '21da33570278762d7e9375b83eb74130bf82728d':
First pass at replacing native plugin views with java.
Merge commit 'dda648f00aa6ea7b12dc4b96e70a6ced3c422e4a'
* commit 'dda648f00aa6ea7b12dc4b96e70a6ced3c422e4a':
Reconcile the character popups for the hard and soft keyboards.
Merge commit 'bfb4992f190b1f93e70d2102f35f8df019406758'
* commit 'bfb4992f190b1f93e70d2102f35f8df019406758':
Adding a system property to log slow queries
Merge commit 'ac02592986ef5c0d6f8a4f01627c0caa69d7b047'
* commit 'ac02592986ef5c0d6f8a4f01627c0caa69d7b047':
Preserve ListView's pressed state when the adapter changes its content while the user is pressing an item.
Merge commit 'a451c6255962116516c3b4df92fd72084a881e0e'
* commit 'a451c6255962116516c3b4df92fd72084a881e0e':
redraw once more on a touch-up if we've been dragging, so we can redraw in high-quality mode
Merge commit 'cc5c8a42fc609246d8f781a22e24d084c76cc9c5'
* commit 'cc5c8a42fc609246d8f781a22e24d084c76cc9c5':
change to use the new CALLER_IS_SYNCADAPTER flag
Merge commit 'a90d14f2ddef7f09a1cfb98a7d25b1dbc237409c'
* commit 'a90d14f2ddef7f09a1cfb98a7d25b1dbc237409c':
Add SurfaceView API to put surface on top of window.
Merge commit '6cd80d738969e9398f763691bde4e240bff48074'
* commit '6cd80d738969e9398f763691bde4e240bff48074':
if the cursor and focus don't match, match them on text view clicks
Merge commit 'c6a35f8e3f6823f095259ee5ffd595d123c0cc1b'
* commit 'c6a35f8e3f6823f095259ee5ffd595d123c0cc1b':
compute Y scroll max by scaling only, ignoring title bar height
Merge commit '1f42641ebf775d0438f2694876067e547a40527a'
* commit '1f42641ebf775d0438f2694876067e547a40527a':
special-case coordinate conversion when we are taking content coordinates to be invalidate. We need to
Merge commit 'e8f77e69c095ff029c114159d8ae7ecb3b10d762'
* commit 'e8f77e69c095ff029c114159d8ae7ecb3b10d762':
Fix 2083478: Camera needs an auto-focus cancel API
Merge commit 'a4160068beadf64db99f42ca327bfe263cc46a85'
* commit 'a4160068beadf64db99f42ca327bfe263cc46a85':
Last big work on #1991910: Make swipes work with capacitive keys
Merge commit '23b141efe5d63bd3859aba4ffa0533cb6fad0c59'
* commit '23b141efe5d63bd3859aba4ffa0533cb6fad0c59':
Fix issue #2116977: buttons are huge and bent
Merge commit '426ec7f30679c813350c18bdae125fce5b1c7725'
* commit '426ec7f30679c813350c18bdae125fce5b1c7725':
add system properties for experimenting with sync timeouts.
Merge commit 'dc0ec6d6da1a330a292d49ab97a47f9218222f9b'
* commit 'dc0ec6d6da1a330a292d49ab97a47f9218222f9b':
Clear the password field when reloading the current page.
Merge commit 'd5b281f4b4e018a41846f1e81d02e75059bf7030'
* commit 'd5b281f4b4e018a41846f1e81d02e75059bf7030':
process: Switch to common cutils sched_policy api
Merge commit '9fc38f40feb871bd51309244984b1d13bdc5b9aa'
* commit '9fc38f40feb871bd51309244984b1d13bdc5b9aa':
Bring up the soft keyboard when touching a focused textfield.
Merge commit 'd5a2813bb77653f24aa9f6fba190c7e7cac59f01'
* commit 'd5a2813bb77653f24aa9f6fba190c7e7cac59f01':
Remove trackball double click. Treat each click as a single click.
Merge commit '3ff3e3fc3f3128c785d1b9d66b726426d7840cb8'
* commit '3ff3e3fc3f3128c785d1b9d66b726426d7840cb8':
Set the minimum fling to the title height.
Merge commit '76d82371a90e81f2d5214d7b16ba713cb73771d1'
* commit '76d82371a90e81f2d5214d7b16ba713cb73771d1':
Add "rtsp" to the list of URL schemes that get linkified.
Merge commit '920d01f80a34c4b9098f79433b14091caea6a38a'
* commit '920d01f80a34c4b9098f79433b14091caea6a38a':
Per suggestion in http://b/issue?id=2062340, update the UNIQUE in the
Merge commit 'd161e3f2753507ed0b1d62d2e9d16a882f6db989'
* commit 'd161e3f2753507ed0b1d62d2e9d16a882f6db989':
Use floor to calculate the range to avoid the rounding error triggered
Merge commit 'c16f6f333122ff7c642d2eaa946e9978aadb4dda'
* commit 'c16f6f333122ff7c642d2eaa946e9978aadb4dda':
Tell GlobalSearch about searches without a suggestion
Merge commit 'a47260887917546fc867b8998fa3ba77639d64a4'
* commit 'a47260887917546fc867b8998fa3ba77639d64a4':
Moving ImProvider to TalkProvider: Change Im.java to use the new TalkProvider; change the authority
Merge commit '7c3e493d7b2db7f28d6fdb52d79c4d99ef1502b8' into eclair-plus-aosp
* commit '7c3e493d7b2db7f28d6fdb52d79c4d99ef1502b8':
Fix for #2092883: Allow manual sync even when background data is disabled
Merge commit 'e74050a9ca248eb6a8d3d8fc2d7712b340afddcc' into eclair-plus-aosp
* commit 'e74050a9ca248eb6a8d3d8fc2d7712b340afddcc':
Allow only System Service to send most Bluetooth intents.
Merge commit '64ce0f8f5315e3a364aea047360520b097e7a7cd' into eclair-plus-aosp
* commit '64ce0f8f5315e3a364aea047360520b097e7a7cd':
First pass at replacing native plugin views with java.