Merge commit 'ecaf00e88ffd15c8471b41e7349ab37a125c9333' into eclair-plus-aosp
* commit 'ecaf00e88ffd15c8471b41e7349ab37a125c9333':
DO NOT MERGE: Copy 4.xml to 5.xml to allow Eclair to diverge from Donut.
Merge commit 'd2cd9467b876777d512911fadeb948e58b9de257' into eclair-plus-aosp
* commit 'd2cd9467b876777d512911fadeb948e58b9de257':
Suppress warning around old vcard code.
Merge commit 'be3bceb5b908c23eeda5a8d04d2ea3d43cc7ed10' into eclair-plus-aosp
* commit 'be3bceb5b908c23eeda5a8d04d2ea3d43cc7ed10':
fix the logic for starting a sync after the accounts changed
Merge commit '3de07024c80fb8a983d4a804ff6d14a49b3f7979' into eclair-plus-aosp
* commit '3de07024c80fb8a983d4a804ff6d14a49b3f7979':
- make an AccountManager per context, not one per process
Merge commit '32f76f34075450c03c68fc1f65e395d5eddd6d51' into eclair-plus-aosp
* commit '32f76f34075450c03c68fc1f65e395d5eddd6d51':
Add a new IResourceValue that knows about the density.
Merge commit '7c47adefea3101876f747926e7631406b4fbf45e' into eclair-plus-aosp
* commit '7c47adefea3101876f747926e7631406b4fbf45e':
Dock screen on config can now select AC or USB.
Merge commit '520ca7e503498f394ad67faf8caecea25a1930ea' into eclair-plus-aosp
* commit '520ca7e503498f394ad67faf8caecea25a1930ea':
Add support for thumbnails to WallpaperInfo.
Merge commit 'c3c6621a2cf2f0d40d062dcad1c9f65485473841' into eclair-plus-aosp
* commit 'c3c6621a2cf2f0d40d062dcad1c9f65485473841':
Setting the default HTTP user agent at runtime init.
Merge commit 'df5862173c03f0d9595a2a5cb56c4af407d893dd' into eclair-plus-aosp
* commit 'df5862173c03f0d9595a2a5cb56c4af407d893dd':
fix bug 2100169: add the line1 number + "/TYPE=PLMN" when sending a pdu.
Merge commit '13006be19ef35f46effd10c422204cfe144136d6' into eclair-plus-aosp
* commit '13006be19ef35f46effd10c422204cfe144136d6':
Don't restore any setting that we don't think should be backed up
Merge commit '4271c7c36bc6c3acef1a7d0926a5cf300e5efa4a' into eclair-plus-aosp
* commit '4271c7c36bc6c3acef1a7d0926a5cf300e5efa4a':
Keep track of 'initial' sync state in SyncStatusInfo
Merge commit '63147705bc2893d6ad43270e04beb9ee01e2ad53' into eclair-plus-aosp
* commit '63147705bc2893d6ad43270e04beb9ee01e2ad53':
Don't show the badge background when we have no uri, email, or phone.
Merge commit 'b03b3bbd6833f7c6fbd8100fa3958220554f66a3' into eclair-plus-aosp
* commit 'b03b3bbd6833f7c6fbd8100fa3958220554f66a3':
If backup fails, reenqueue all of the affected packages for next time.
Merge commit '36dac6ae8e005f0247e44345727d1580b1623127' into eclair-plus-aosp
* commit '36dac6ae8e005f0247e44345727d1580b1623127':
Bring the dimples back, and make the "spin around" animation have a fling feeling.
Merge commit '9bfb707597898f54722460b48588007b682f3e2a' into eclair-plus-aosp
* commit '9bfb707597898f54722460b48588007b682f3e2a':
Various fixes and improvements to window, activity.
Merge commit 'c0b8a96d28c55cb51e4f9e1f85c8d3ecf1ff13bf' into eclair-plus-aosp
* commit 'c0b8a96d28c55cb51e4f9e1f85c8d3ecf1ff13bf':
launching plugin activity when a plugin requests to go full screen.
Merge commit '34ca22d25303633c855a738409ea2f8e3f79a713' into eclair-plus-aosp
* commit '34ca22d25303633c855a738409ea2f8e3f79a713':
Set the bonding for incoming connections only when authentication is requested.
Merge commit '6c644f248f553898248b8a6948fac4d62874fedd' into eclair-plus-aosp
* commit '6c644f248f553898248b8a6948fac4d62874fedd':
Add parameter for the restore set (device id) data is being restored from to the restore_start event
Merge commit '916b2ca9375b0a6a54e2bef2b2b5faab23ac3cfb' into eclair-plus-aosp
* commit '916b2ca9375b0a6a54e2bef2b2b5faab23ac3cfb':
Use FLAG_ACTIVITY_CLEAR_TOP when launching search suggestions.
Merge commit '78f180af218017898593021a0b7fdf9b38aa2b25' into eclair-plus-aosp
* commit '78f180af218017898593021a0b7fdf9b38aa2b25':
Update viewport when height or width change.
* changes:
1) Add the wma / wmv profile reader. 2) Add the flag which check the wma/wmv enable properties. If the codec is not enable, then skip the wma / wmv related test cases. 3) Added a workaround which let the testcodecspecific test case continue even though there is a failure in the middle of the test. Besides, take out the remvoeFile for temporary usage.
Merge commit 'dee76be487fcdc975877f85221a693b87b9669a7' into eclair-plus-aosp
* commit 'dee76be487fcdc975877f85221a693b87b9669a7':
Fix for 2122292: make sure we unregister the ContentObserver for the system location settings. Also make the GoogleLocationManager use the singleton pattern correctly.
Merge commit '24a3ff958b87550904a71961835f6883d1411c27' into eclair-plus-aosp
* commit '24a3ff958b87550904a71961835f6883d1411c27':
Change double tap toast to long toast.
Merge commit '194099dc4f614130f3baff14850792e6dc3fa59b' into eclair-plus-aosp
* commit '194099dc4f614130f3baff14850792e6dc3fa59b':
Reimplement the settings to use async callbacks
Merge commit '0676690091b348d939db0340c3a0d888683c1abb' into eclair-plus-aosp
* commit '0676690091b348d939db0340c3a0d888683c1abb':
Fix bug with ScrollView so that text entry fields are not hidden by virtual keyboard.
