Merge commit '6c42a4bad668bc4b742e3f657f9491165d22bfb0'
* commit '6c42a4bad668bc4b742e3f657f9491165d22bfb0':
Fix a handful of bugs in the ContactHeaderWidget
Merge commit 'e525eef4b8e284ac8eb023bd0df4eeed37916d4b'
* commit 'e525eef4b8e284ac8eb023bd0df4eeed37916d4b':
Update comment in mediaplayer.h.
Update documentation for getVideoWidth and getVideoHeight.
Make Uri.parseUserPart, parseHost, and parsePort symmetric
Javadoc used startApplication() which doesnt exists, changed to createApplication()
Merge commit 'ea8844811d1b0965f5c2f43006c0a08bcd73f23a'
* commit 'ea8844811d1b0965f5c2f43006c0a08bcd73f23a':
Added a field to track if the call is to a voicemail instance.
Merge commit '20158b9ce5895fdbdedf5db103583264d94a62a4'
* commit '20158b9ce5895fdbdedf5db103583264d94a62a4':
slide the title if the site changes the scroll position
Merge commit '0c2289053127e43e517ff8cc096d691c15279fed'
* commit '0c2289053127e43e517ff8cc096d691c15279fed':
Refactor logic for starting forward servers and http test cases hacking, so that they can be shared between automated test mode and UI launch mode.
Merge commit 'bdd1f2e37e67cc530e54ea7b8a23df60a4aa1a9b'
* commit 'bdd1f2e37e67cc530e54ea7b8a23df60a4aa1a9b':
Add support for launching activities when attaching to a car or desk dock.
Merge commit '5a7477cee84a5e6214c7fb81833bd3bfb8870a18'
* commit '5a7477cee84a5e6214c7fb81833bd3bfb8870a18':
Combine the "Permission Requested" title and subtitle into one string.
Merge commit 'fc1a365740478f61e671fe669fc466a9a753f031'
* commit 'fc1a365740478f61e671fe669fc466a9a753f031':
Add new Gservices setting for discarding uphill ops for eclair and future devices.
Merge commit 'f324b2b0fcc15834fd944adf6afe95d1e5bc6d0a'
* commit 'f324b2b0fcc15834fd944adf6afe95d1e5bc6d0a':
Use separate resources to control orientation change for car and desk docks.
Merge commit 'a78a157905ae49a170b0e2239df96b1f365f646d'
* commit 'a78a157905ae49a170b0e2239df96b1f365f646d':
Don't scroll on load if titlebar is visible
Merge commit '51173401f4742d92d46af602190a98372f10bda9'
* commit '51173401f4742d92d46af602190a98372f10bda9':
Another software color conversion implementation, this time OMX_QCOM_COLOR_FormatYVU420SemiPlanar => rgb565.
Merge commit 'bbfbf187efc47eb55f07928abdc7055d781f859e'
* commit 'bbfbf187efc47eb55f07928abdc7055d781f859e':
Remove deadlock in PackageManager when installing or upgrading packages.
Merge commit '5e3f452c4634c74a4e659ef6c7357c594c77b10c'
* commit '5e3f452c4634c74a4e659ef6c7357c594c77b10c':
Use Resources to load search icons with android.resource URIs
Merge commit 'e1c64f8f14700c5ef090fbbc231b971b9cd6e8de'
* commit 'e1c64f8f14700c5ef090fbbc231b971b9cd6e8de':
Clean ExifInterface. Prepare to make it public.
Merge commit 'b8e398abe483cdbcaf43fd7efe6bb8c5bd1bc7ac'
* commit 'b8e398abe483cdbcaf43fd7efe6bb8c5bd1bc7ac':
Add the hide for the inner class definition.
Merge commit '614fd72d21a90c04ecf837f6ce69dc421ae852e2'
* commit '614fd72d21a90c04ecf837f6ce69dc421ae852e2':
Fix the missing part for reading enterprise fields in wifi configuration
Merge commit '46f116520fe7ec04e99dd37d805fc852a71bf795'
* commit '46f116520fe7ec04e99dd37d805fc852a71bf795':
Flag indicating if Contacts source has any unsynced groups.
Merge commit '10bedaaf3ec24af5fa4dcea54545e4d4953a1c7d'
* commit '10bedaaf3ec24af5fa4dcea54545e4d4953a1c7d':
Implement issue #1780928: Need support hiding nav keys.
Merge commit '055714ddbb0db6634e362b357f5e11a77444c6de'
* commit '055714ddbb0db6634e362b357f5e11a77444c6de':
Make vCard importer code use Account information if possible.
Merge commit 'a432231515df66fa4051bae1d8d319f315af8cca'
* commit 'a432231515df66fa4051bae1d8d319f315af8cca':
revert to black video background, since we don't need the color-key anylonger
Merge commit '8ac7a829bd0684ee69ed3a01cec877d93fc7a7db'
* commit '8ac7a829bd0684ee69ed3a01cec877d93fc7a7db':
fix [2122448] android_native_window_t::setUsage() only reallocates the first buffer
Merge commit '20dfa6abca11e1f01ace07f11c5d06e7337ccb00'
* commit '20dfa6abca11e1f01ace07f11c5d06e7337ccb00':
Add RotarySelector widget to android.internal for use by lock screen and incoming call screen.
Merge commit '35ec0031bca4a9fb2fe7c80500e95f8c5b3464d8'
* commit '35ec0031bca4a9fb2fe7c80500e95f8c5b3464d8':
New field in CallerInfo to cache if the call is an emergency one.
Merge commit 'd4e3265b1a93f5bd5a8b1ba0f9166af8a89ee164'
* commit 'd4e3265b1a93f5bd5a8b1ba0f9166af8a89ee164':
Revert "fix [2122448] android_native_window_t::setUsage() only reallocates the first buffer"
Merge commit 'd071bbd7fbc64775040950d1e21174f93c8b831e'
* commit 'd071bbd7fbc64775040950d1e21174f93c8b831e':
make the window-shade use an opaque surface if possible
Merge commit 'f2b0fb8c913cb3504f24e04be2221b81979b0cb3'
* commit 'f2b0fb8c913cb3504f24e04be2221b81979b0cb3':
Fix for #2092883: Allow manual sync even when background data is disabled
Merge commit 'e10bbc50a69201d2dd61b414ffd77cf2a6bc2dca'
* commit 'e10bbc50a69201d2dd61b414ffd77cf2a6bc2dca':
Allow only System Service to send most Bluetooth intents.
Merge commit 'c2ee811d09126236ae41b2b3015ed60d508ac9ef'
* commit 'c2ee811d09126236ae41b2b3015ed60d508ac9ef':
fix [2122448] android_native_window_t::setUsage() only reallocates the first buffer
Merge commit '21da33570278762d7e9375b83eb74130bf82728d'
* commit '21da33570278762d7e9375b83eb74130bf82728d':
First pass at replacing native plugin views with java.
Merge commit '6a20b823c3c9de8daa1c4bc002d6e58fe82d3a60' into eclair-plus-aosp
* commit '6a20b823c3c9de8daa1c4bc002d6e58fe82d3a60':
Fix a handful of bugs in the ContactHeaderWidget
Merge commit 'dda648f00aa6ea7b12dc4b96e70a6ced3c422e4a'
* commit 'dda648f00aa6ea7b12dc4b96e70a6ced3c422e4a':
Reconcile the character popups for the hard and soft keyboards.
Merge commit 'c52ae862ef18218f6db0c8b538d5cdf2685a07b1'
* commit 'c52ae862ef18218f6db0c8b538d5cdf2685a07b1':
Build the BitmapShader if it hasn't been built yet.
