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 '296e7b951914f983b4d063da02d38162ac01abd0'
* commit '296e7b951914f983b4d063da02d38162ac01abd0':
Add a new IResourceValue that knows about the density.
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 '9bb05ab9d5bcfdd214bbdce89cd87877f5e9b452'
* commit '9bb05ab9d5bcfdd214bbdce89cd87877f5e9b452':
fix bug 2100169: add the line1 number + "/TYPE=PLMN" when sending a pdu.
Merge commit 'a0b07d2c0297e8f10c2d98428b2acacb531cd5a7'
* commit 'a0b07d2c0297e8f10c2d98428b2acacb531cd5a7':
Don't restore any setting that we don't think should be backed up
Merge commit 'cd7574014c874d2bc75be8a3f3c1bab862205999'
* commit 'cd7574014c874d2bc75be8a3f3c1bab862205999':
Keep track of 'initial' sync state in SyncStatusInfo
Merge commit 'af2c5915a57454ab0762755d85171d912e753063'
* commit 'af2c5915a57454ab0762755d85171d912e753063':
Don't show the badge background when we have no uri, email, or phone.
Merge commit 'cd8e04d7871eb9303de78af0a2ecd7bce29d2e58'
* commit 'cd8e04d7871eb9303de78af0a2ecd7bce29d2e58':
If backup fails, reenqueue all of the affected packages for next time.
Merge commit 'b978ee3c253499f2ed4af7bb1f54b8b7ae1ad99c'
* commit 'b978ee3c253499f2ed4af7bb1f54b8b7ae1ad99c':
Bring the dimples back, and make the "spin around" animation have a fling feeling.
Merge commit '353bf45201e9440b61de8f89c92d1823ba55a198'
* commit '353bf45201e9440b61de8f89c92d1823ba55a198':
Various fixes and improvements to window, activity.
Merge commit 'effd391a96f473e113df9c116a98ceeb6e067ff7'
* commit 'effd391a96f473e113df9c116a98ceeb6e067ff7':
launching plugin activity when a plugin requests to go full screen.
Merge commit 'd7c4cf5fdfe0d26c0b40ba8823b8ea321a486367'
* commit 'd7c4cf5fdfe0d26c0b40ba8823b8ea321a486367':
Set the bonding for incoming connections only when authentication is requested.
Merge commit 'ee852f5fbd887c8a566703300b0fed141351575f'
* commit 'ee852f5fbd887c8a566703300b0fed141351575f':
Add parameter for the restore set (device id) data is being restored from to the restore_start event
Merge commit '22d3ba8ac6faddcdad279b775a5f6237c0d2132f'
* commit '22d3ba8ac6faddcdad279b775a5f6237c0d2132f':
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 '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.
This will allow the layoutlib to resize bitmaps that are
not in the native density of the rendering.
Change-Id: If9dca6d51cd93a2083c96fce3ac64335ec6ad801
Clean up the Gallery to show thumbnails appropriately; still using FPO artwork
for wallpapers without thumbnails.
This change introduces a new "thumbnail" attribute to the API (used
in wallpaper metadata to point to the thumbnail drawable resource).
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
