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.
Merge commit 'd58ccff769e40a6c52e9f6e30e4016590e05ba9a' into eclair-plus-aosp
* commit 'd58ccff769e40a6c52e9f6e30e4016590e05ba9a':
Add a boolean indicating if the apple-touch-icon is precomposed.
Merge commit '408cf85207a43c9169f9fb520a584d2858847d24' into eclair-plus-aosp
* commit '408cf85207a43c9169f9fb520a584d2858847d24':
Support the new dpi change in the WebView.
Merge commit '7b7029e0325b1a096bdbe5da3f8ec795c2aff9d6' into eclair-plus-aosp
* commit '7b7029e0325b1a096bdbe5da3f8ec795c2aff9d6':
Make media scanner read the jpeg orientation tag.
Merge commit 'f53c1865248dd2b38f8c24a0419d550330619b19' into eclair-plus-aosp
* commit 'f53c1865248dd2b38f8c24a0419d550330619b19':
Don't snap the initialScale to min or max if it is not defined.
Merge commit '5b4aa6db428263aa0a48ab3efb896df66a852bce' into eclair-plus-aosp
* commit '5b4aa6db428263aa0a48ab3efb896df66a852bce':
VpnService: use Credentials instead of CertTool.
Merge commit '585c67f70f18b8879ced854c5865141d6c650cd8' into eclair-plus-aosp
* commit '585c67f70f18b8879ced854c5865141d6c650cd8':
experimental fix for compatibility mode. When we scale up by 1.5 (240 dpi), we put stretched ninepatches on
* changes:
experimental fix for compatibility mode. When we scale up by 1.5 (240 dpi), we put stretched ninepatches on exact pixel boundaries when we walk the inverse matrix (e.g. 2/3, 1+1/3, 2, 2+2/3, 3+1/3, 4, ...).
Merge commit '976e363fe8206fcac5f2342ed3a0c3e0df66d32d' into eclair-plus-aosp
* commit '976e363fe8206fcac5f2342ed3a0c3e0df66d32d':
Add search_mode flag to intents launched by QSB suggestions
There was a regression introduced in AudioFlinger by change 24114 for suspended output:
The suspended output was not reading and mixing audio tracks.
When the phone is ringing, the A2DP output is suspended if the SCO headset and A2DP headset are the same. As the ringtone is played over the duplicated output, the fact that the A2DP output was not reading data was causing the hardware output to be stalled from time to time.
Merge commit '5f55d8c9d447f492aed955ac29454e0c482a4956' into eclair-plus-aosp
* commit '5f55d8c9d447f492aed955ac29454e0c482a4956':
Fix the incorrect field name in EAP wifi network.
