Merge commit '3adab9fcfffa57dd45e9ccace5e21123158e489b'
* commit '3adab9fcfffa57dd45e9ccace5e21123158e489b':
Make ContactStruct explicitly set RawContacts.ACCOUNT_NAME and RawContacts.ACCOUNT_TYPE to null.
Merge commit 'f4c102c4a834dd17265780b2694759b113863c98'
* commit 'f4c102c4a834dd17265780b2694759b113863c98':
Re-hide the contacts APIs, the droiddoc build is failing.
Merge commit 'ed4efca6415bafcdc4df1b23d9d658c07883815f'
* commit 'ed4efca6415bafcdc4df1b23d9d658c07883815f':
wallpaper: don't erase the background, just to repaint over it. saves 1.7 ms on some hardware
Merge commit '99961218ed0ed9d64e533c2d0e377b3cf75f34da'
* commit '99961218ed0ed9d64e533c2d0e377b3cf75f34da':
Fix 2105956: The nine patch markers for one of the zoom buttons were reversed
Merge commit '1f21839a9828995eb01634f36d34c55ca9aeca3e'
* commit '1f21839a9828995eb01634f36d34c55ca9aeca3e':
Delay broadcasting ACCOUNTS_CHANGED until we're certain AndroidId is ready.
Merge commit '3fee3fb646fc81d199007d1eacfef7abb4e0650c'
* commit '3fee3fb646fc81d199007d1eacfef7abb4e0650c':
make the SyncManager listen for backgroun data setting changes and do a sync when the setting is enabled
Merge commit '6351cf72a55def4e1bca5764dea8cbca99f13b90'
* commit '6351cf72a55def4e1bca5764dea8cbca99f13b90':
add hashCode() and equals() to Rfc822Token, as well as a convenience tokenizer method to Rfc822Tokenizer, as part of a calendar guest bugfix.
Merge commit '307ad592b8aa5d9246f7db4f8f1f8faafbe5eafa'
* commit '307ad592b8aa5d9246f7db4f8f1f8faafbe5eafa':
invalidate the webview after pressing the IME 'next' button
Merge commit '2fd4943847d0209bef39171c1278ad6c86072dcc'
* commit '2fd4943847d0209bef39171c1278ad6c86072dcc':
Provide a getter to access the width of the HTML document.
Merge commit 'c3bfa6048da74dd54f9147f6600ad0537cbe7bd6'
* commit 'c3bfa6048da74dd54f9147f6600ad0537cbe7bd6':
add definition for Mms.TempStorage content uri and filename.
Merge commit 'ea2aabf1b21f756f06b0b7535c80807d986683d8'
* commit 'ea2aabf1b21f756f06b0b7535c80807d986683d8':
Move destroying the web view to the WVC thread (previously it was on the UI thread)
Merge commit '90c0d0ab42ec909290abcc168ac0deded05a1141'
* commit '90c0d0ab42ec909290abcc168ac0deded05a1141':
In calcOurContentVisibleRect, account for the visible title bar.
Merge commit 'e7244b0482f6bdb21fc27aca078372333d0de5a2'
* commit 'e7244b0482f6bdb21fc27aca078372333d0de5a2':
Back button in search always goes back or closes search
Merge commit '8f0d64693e155b1db2ff89cde1f050b4b6b0ec7a'
* commit '8f0d64693e155b1db2ff89cde1f050b4b6b0ec7a':
Fix bug where onStartCommand() was never called with a null intent.
Merge commit 'f73afeeec3d4c841207ffc4e5415b8fe4555a5a1'
* commit 'f73afeeec3d4c841207ffc4e5415b8fe4555a5a1':
fix the logic for starting a sync after the accounts changed
Merge commit 'd5b16418ed7dcdeeba108bad0e4c78ef25ded52c'
* commit 'd5b16418ed7dcdeeba108bad0e4c78ef25ded52c':
- make an AccountManager per context, not one per process
Merge commit '648297ff5d1a56f08985d26d58f1471e2ff0ba86'
* commit '648297ff5d1a56f08985d26d58f1471e2ff0ba86':
Dock screen on config can now select AC or USB.
Merge commit '2b0d6e7e43f92b1fb1dea207b3eb4121369594c3'
* commit '2b0d6e7e43f92b1fb1dea207b3eb4121369594c3':
Add support for thumbnails to WallpaperInfo.
Merge commit '7ca38352b911bfd299f5862da930e388eba7f903'
* commit '7ca38352b911bfd299f5862da930e388eba7f903':
Setting the default HTTP user agent at runtime init.
Merge commit '23703f16f816d4212e5a95c101a851660c095f24' into eclair-plus-aosp
* commit '23703f16f816d4212e5a95c101a851660c095f24':
Make ContactStruct explicitly set RawContacts.ACCOUNT_NAME and RawContacts.ACCOUNT_TYPE to null.
Merge commit 'ffa424800d0338b8b894aef2ea1e3e3344cbda7a' into eclair-plus-aosp
* commit 'ffa424800d0338b8b894aef2ea1e3e3344cbda7a':
Fix issue #2133206: dialogs/menus should auto-dismiss when screen turns off
Lot of infrastructure for more things to go away when "clear system dialogs"
happens, and now do this when we turn on the lock screen.
Change-Id: I567130296fe47ce82df065ed58ef21b37416ceaf
Merge commit '0c23212ebdfbe008aca95d2ace2e52ca0a0b7ec7' into eclair-plus-aosp
* commit '0c23212ebdfbe008aca95d2ace2e52ca0a0b7ec7':
Re-hide the contacts APIs, the droiddoc build is failing.
Merge commit '7c5c6076ea5d02aabbb449b1341ec44d184d1316' into eclair-plus-aosp
* commit '7c5c6076ea5d02aabbb449b1341ec44d184d1316':
Support IPv6 literal URLs, e.g., http://[2001:4860:b004::68]/ as per RFC 3896