Merge commit 'df4edc807ca32419118a9b86a3d68b0fac02f5fa' into eclair-plus-aosp
* commit 'df4edc807ca32419118a9b86a3d68b0fac02f5fa':
Modify android.syncml.pim so that no one is going to use.
Merge commit 'a8cdbc85c003eae8c1b7178fcd70f8bc711aed96' into eclair-plus-aosp
* commit 'a8cdbc85c003eae8c1b7178fcd70f8bc711aed96':
Make Phone.updateServiceLocation acquire a one-shot wake lock.
Merge commit '6ba23c59f24b443cd21c6289fa0aac3df8f17017' into eclair-plus-aosp
* commit '6ba23c59f24b443cd21c6289fa0aac3df8f17017':
Handle cases where TYPE can be undefined, such as EAS.
Merge commit '24d237db943051942b5966f5e788d67050ec0ba5' into eclair-plus-aosp
* commit '24d237db943051942b5966f5e788d67050ec0ba5':
add a debug property to disable h/w composition. debug.sf.hw, when set to 0 will disable h/w composition
Merge commit 'd0f02a4da1413743c90a51426bc3221bfa6ff342' into eclair-plus-aosp
* commit 'd0f02a4da1413743c90a51426bc3221bfa6ff342':
Do not die when printing empty prefs.
Merge commit '67af9f5bf1abdaeedbdf21c1de9502d33de8f16f' into eclair-plus-aosp
* commit '67af9f5bf1abdaeedbdf21c1de9502d33de8f16f':
Fixed the fastscroll thumb asset in hdpi.
Merge commit '9ca7d0c2efe76798e0963fd0b27a7224e9819171' into eclair-plus-aosp
* commit '9ca7d0c2efe76798e0963fd0b27a7224e9819171':
The empty path and no path mean default path. So "a=d" should replace "a=c".
Merge commit 'b33f92dd5666134782a06b191a9025544711f85b' into eclair-plus-aosp
* commit 'b33f92dd5666134782a06b191a9025544711f85b':
fix [2102410] Home Screen is not displayed in the background in Landscape Mode
Merge commit 'f46a9cf38207d03730c04d02cf40aa3859cd9ad3' into eclair-plus-aosp
* commit 'f46a9cf38207d03730c04d02cf40aa3859cd9ad3':
API to combine LOOKUP_KEY and Contacts._ID together.
Merge commit 'd82bc5158c764bdd30b7d22f32258ad3c2c0c0f6' into eclair-plus-aosp
* commit 'd82bc5158c764bdd30b7d22f32258ad3c2c0c0f6':
Avoid the rounding error, as Math.round(Math.round(viewWidth * mInvActualScale) * mActualScale) not necessary to be viewWidth, we special case when the content exactly fit in the view case.
Merge commit 'f416264a3b13c5965bfe1c75e9fb2a480d556f87' into eclair-plus-aosp
* commit 'f416264a3b13c5965bfe1c75e9fb2a480d556f87':
Adjust the WebTextView's text size according to density.
Merge commit 'd380586ac19903145e23ad3a8d073f01b4fe1192' into eclair-plus-aosp
* commit 'd380586ac19903145e23ad3a8d073f01b4fe1192':
Remove the FallRS demo, now promoted as a wallpaper.
Merge commit '201511cf8a004d386ec9f592041ad3e3d4107184' into eclair-plus-aosp
* commit '201511cf8a004d386ec9f592041ad3e3d4107184':
Calculate proper output buffer size for some more 16-bit RGB color spaces.
Merge commit '4e60d7e60b29c42c6745dd23ff90dced8834fa7c' into eclair-plus-aosp
* commit '4e60d7e60b29c42c6745dd23ff90dced8834fa7c':
Support encoding amr-wb content in stagefright.
Merge commit '100f08613392c225b8dff3f1e1d586f981884e29' into eclair-plus-aosp
* commit '100f08613392c225b8dff3f1e1d586f981884e29':
Query for all properties if a property change is received and cache is empty.
