Merge commit '2f208646ebe7579c2b8694c66d55f8c883df0ec3'
* commit '2f208646ebe7579c2b8694c66d55f8c883df0ec3':
Re-instate the link coloring on startup, but going via the browser
Merge commit 'ed7f883187f8f6c6dfd240412523a911f616b688'
* commit 'ed7f883187f8f6c6dfd240412523a911f616b688':
Add Gservices flag for Vending doctor download complete timeout.
Merge commit 'dfab8b687039ef764249c22c00d0b030c55067da'
* commit 'dfab8b687039ef764249c22c00d0b030c55067da':
check for null item in web history in saveState
Merge commit '11bb09c3829c6dc6874ed833bf9adcb1bc3195e3'
* commit '11bb09c3829c6dc6874ed833bf9adcb1bc3195e3':
EventLog when a database file is deleted due to corruption.
Merge commit 'a4f2ac7e0e2cc4cfcf19c7ac536fe0dd0306354c'
* commit 'a4f2ac7e0e2cc4cfcf19c7ac536fe0dd0306354c':
Allow scrolls to continue when getting a new content size.
Merge commit 'ce37120df3099a1bb544ff1ef1a016a20794dd51'
* commit 'ce37120df3099a1bb544ff1ef1a016a20794dd51':
Fix bug where we would return null with disabled components.
Merge commit '4df43ab1d834f839f3b1e535554836a936902d00'
* commit '4df43ab1d834f839f3b1e535554836a936902d00':
Fix issue #1930911: Crash in system process
Merge commit 'e6566064a990fcfc21334df33eb9c771f22eb0d5'
* commit 'e6566064a990fcfc21334df33eb9c771f22eb0d5':
Finish off java API to allow fading scrollbars
When webkit modifies a text field programmatically, it may change
the selection. This competes with the UI thread attempting to
set the selection in response to the IME next button and changes
made by the trackball.
One recent fix (https://android-git.corp.google.com/g/#change,26904)
sets the selection from the UI side after the IME generated click.
Unfortunately, this can be generated under other circumstances,
so this change qualifies this with mOkayForFocusNotToMatch, which
is only set after the IME next button is pressed.
The other change qualfies onTextChanged calls so that if it was
triggered by setTextAndKeepSelection, the webkit-side selection
is unchanged.
fixes http://b/issue?id=2096746
Merge commit 'ccf6947eaaa5f7af57290dcdcdfbabe0a8985015' into eclair-plus-aosp
* commit 'ccf6947eaaa5f7af57290dcdcdfbabe0a8985015':
Re-instate the link coloring on startup, but going via the browser
Merge commit '2e4dbe70e7c0fe003dab0837fd1dba2703bdd6e2' into eclair-plus-aosp
* commit '2e4dbe70e7c0fe003dab0837fd1dba2703bdd6e2':
Unhide APIs for enabling geolocation in web views. I've confirmed
Merge commit '8eb0f348931c9185ae6a8f49964c904c42b2bb57' into eclair-plus-aosp
* commit '8eb0f348931c9185ae6a8f49964c904c42b2bb57':
Prevent NPE when doing a fillSpecific layout.
Merge commit 'de04cb810f47c679583767df78f8490d96d310d1' into eclair-plus-aosp
* commit 'de04cb810f47c679583767df78f8490d96d310d1':
Add Gservices flag for Vending doctor download complete timeout.
Merge commit 'ac35dc4716a448734493d939a1cb5af4d03cf41c' into eclair-plus-aosp
* commit 'ac35dc4716a448734493d939a1cb5af4d03cf41c':
Implement the checkin option in AccountManagerService.dump()
Merge commit 'd35afcda674eaa0222f0adbf8d712bde3a388a39' into eclair-plus-aosp
* commit 'd35afcda674eaa0222f0adbf8d712bde3a388a39':
border for the non-badge case
