Merge commit '4b5e7d908bfda633fea72f5d20dae63328019c93' into eclair-plus-aosp
* commit '4b5e7d908bfda633fea72f5d20dae63328019c93':
ContactsContract: Adding joined columns to the CommonDataKind class definitions.
Merge commit 'cd0aceb710fc3b62a238992ceef628e359ee1e7d' into eclair-plus-aosp
* commit 'cd0aceb710fc3b62a238992ceef628e359ee1e7d':
Draw a green triangle using OpenGL 2.0 APIs.
Merge commit 'e785d1804dbf67913aeb25896a420abebe731e80' into eclair-plus-aosp
* commit 'e785d1804dbf67913aeb25896a420abebe731e80':
Suppressed the invalidFrameRate as the framework is not throwing the IOException anymore.
Merge commit 'de71cb3b6f3a7484402e2288ddfaad3ea3821f59' into eclair-plus-aosp
* commit 'de71cb3b6f3a7484402e2288ddfaad3ea3821f59':
ContactsContract: Adding joined columns to the Data class definition.
Merge commit '90d8a6a449dc12fea2b56b557c243e33746d914a' into eclair-plus-aosp
* commit '90d8a6a449dc12fea2b56b557c243e33746d914a':
Inefficient but correct fix for 2122381: call finishBackup after every performBackup
Merge commit 'b18b0956afbe0730ced1c5b95c0071dba447765e' into eclair-plus-aosp
* commit 'b18b0956afbe0730ced1c5b95c0071dba447765e':
Revert "ContactsContract: Adding joined columns to the Data class definition."
Merge commit 'a411bf01fc8c581651af19556cc9e4bf7aca8da2' into eclair-plus-aosp
* commit 'a411bf01fc8c581651af19556cc9e4bf7aca8da2':
Clean up some debugging and add 2 math lib routines.
Merge commit '6a15417849afab889f1f0cd79e655eaac6b45dca' into eclair-plus-aosp
* commit '6a15417849afab889f1f0cd79e655eaac6b45dca':
ContactsContract: Adding joined columns to the Data class definition.
Merge commit '2c22a51072fd71e3a50df9c26f9078bd62c90cd3' into eclair-plus-aosp
* commit '2c22a51072fd71e3a50df9c26f9078bd62c90cd3':
More hi-res assets, and darken background color to donut level.
Merge commit 'e5a6d16f26543061a0fc815ba90644a44995e025' into eclair-plus-aosp
* commit 'e5a6d16f26543061a0fc815ba90644a44995e025':
Fix http://b/2126318 (density test fails due to wrong-size asset stripping)
Merge commit '3f90aae6184bf0713ad684fcea3c4836479b9de4' into eclair-plus-aosp
* commit '3f90aae6184bf0713ad684fcea3c4836479b9de4':
Fix http://b/2086471 (list view headers too dark in mdpi).
Merge commit 'c3a3b399a9d7707b7f3c4108e0e31a1b664a6f22' into eclair-plus-aosp
* commit 'c3a3b399a9d7707b7f3c4108e0e31a1b664a6f22':
Add a Gservices setting to controll the app error reporting feature.
Merge commit 'fd49faae33dc813c93347d1bcc8fa7c4fa0ae55d' into eclair-plus-aosp
* commit 'fd49faae33dc813c93347d1bcc8fa7c4fa0ae55d':
Add progress view and default poster for the <video> implementation
Merge commit '93727454caf1b3540a352328abd0400c2242902b' into eclair-plus-aosp
* commit '93727454caf1b3540a352328abd0400c2242902b':
Add one line of logging when SCO SOCKET connect starts.
Merge commit 'ffda371c220de9c97663fef4e9d14bee7267383d' into eclair-plus-aosp
* commit 'ffda371c220de9c97663fef4e9d14bee7267383d':
Show the live wallpaper on the lock screen.
Merge commit 'a120d4820d1c40a113fb9f46e996299eaa22ea04' into eclair-plus-aosp
* commit 'a120d4820d1c40a113fb9f46e996299eaa22ea04':
add Eclair to the droiddoc 'since' options so that we
Merge commit '83d4ba83ddf8309d2c0c38d69154217d6a9c0a6c' into eclair-plus-aosp
* commit '83d4ba83ddf8309d2c0c38d69154217d6a9c0a6c':
Do not attempt to retry a scrollTo with a negative position.
Merge commit '6ed525ecee76541aa60ca95598330e990fa16ffa' into eclair-plus-aosp
* commit '6ed525ecee76541aa60ca95598330e990fa16ffa':
When a WebView starts, we may get first layout before viewSizeChanged()
Merge commit '58992eac8373ba7260d99dd832a6fc9e3d164460' into eclair-plus-aosp
* commit '58992eac8373ba7260d99dd832a6fc9e3d164460':
Draw shadow below title, or at top if title is off screen.
