Merge commit '32a702a7a8a328a7080c18fd65478caf82d86e0e'
* commit '32a702a7a8a328a7080c18fd65478caf82d86e0e':
- make SyncManager get the accounts list during the constructor,
Merge commit '8d984bc9c351e18271213c58ae7baea5cc81fda6'
* commit '8d984bc9c351e18271213c58ae7baea5cc81fda6':
Query from Bluez if name is not present in cache.
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
Merge commit '85d86af982026145aa69a4ca280d394b9ea90372' into eclair-plus-aosp
* commit '85d86af982026145aa69a4ca280d394b9ea90372':
Fix vCard composer in three points.
Merge commit '609c2c08d7d059681434ea322b551264abab8a71' into eclair-plus-aosp
* commit '609c2c08d7d059681434ea322b551264abab8a71':
- make SyncManager get the accounts list during the constructor,
* changes:
- make SyncManager get the accounts list during the constructor, which will allow syncs to be scheduled during bootup. The providers need this so that they can potentially schedule syncs while they are starting up. - make the SyncManager message handler wait until boot has completed to start dispatching messages
which will allow syncs to be scheduled during bootup. The
providers need this so that they can potentially schedule
syncs while they are starting up.
- make the SyncManager message handler wait until boot
has completed to start dispatching messages
Merge commit '017c5de1cf1228664da84b31012a386c2eac2232' into eclair-plus-aosp
* commit '017c5de1cf1228664da84b31012a386c2eac2232':
Query from Bluez if name is not present in cache.
- Make it allow composer users to emit Quoted-Printabled primary ("N", "FN", etc.) properties.
- Make it strictly check whether it is necessary for the composer to emit CHARSET infomation.
-- Added the logic "not vCard 3.0, or, CHARSET is not UTF-8".
- Clean up the code (again...)
Merge commit '1935a3417e986d38b9a0d981c3dbd06acf75a9fc' into eclair-plus-aosp
* commit '1935a3417e986d38b9a0d981c3dbd06acf75a9fc':
Change FasttrackBadgeWidget->QuickContactBadge and make public.
Merge commit '6e58cf21088c2e6b0ef52572bfd544347e02fc17' into eclair-plus-aosp
* commit '6e58cf21088c2e6b0ef52572bfd544347e02fc17':
Invoke the OnErrorListener callback when MediaPlayer.setDataSource() throws.
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
