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 '4925591c7308b79140b45f9edf7f9c71976a8fcc'
* commit '4925591c7308b79140b45f9edf7f9c71976a8fcc':
Add rotary based lock screen, and only show security pattern screen when pattern is set.
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.
The fix consists in locking AudioFlinger::mLock mutex in the TrackBase destructor before clearing the strong pointer to the shared memory client. The mutex is not locked in removeclient() any more which implies that we must make sure that the Client destructor is always called from the TrackBase destructor or that we hold the mLock mutex before calling deleting the Client.
Merge commit '074c11c1649a097ba1beae719069f8d4a2dd43e3' into eclair-plus-aosp
* commit '074c11c1649a097ba1beae719069f8d4a2dd43e3':
Do not @hide Parcelable implementations in BluetoothClass and BluetoothDevice.
Merge commit 'ff22b182a2b8aade96d32c65b9af96ccb91f6296' into eclair-plus-aosp
* commit 'ff22b182a2b8aade96d32c65b9af96ccb91f6296':
Add a null checking to avoid crash.
Merge commit '4b6a278cb6b6c80c9f6ed9d35dd67b7898981aa3' into eclair-plus-aosp
* commit '4b6a278cb6b6c80c9f6ed9d35dd67b7898981aa3':
do not merge. Revert "do not merge. Remove voicesearch-specific functionality from framework."
Merge commit 'c7aef5d0fda58a1685e5584b34e1b80ba016f017' into eclair-plus-aosp
* commit 'c7aef5d0fda58a1685e5584b34e1b80ba016f017':
Make ACTV use all available space if height is FILL_PARENT.
Merge commit 'b65c5cf0746338a26bb6e721aa61283742ae58d0' into eclair-plus-aosp
* commit 'b65c5cf0746338a26bb6e721aa61283742ae58d0':
Poster support on the Java side
Merge commit 'f8c90acd7fde806d2d9cccf4d6ec52dc279497bc' into eclair-plus-aosp
* commit 'f8c90acd7fde806d2d9cccf4d6ec52dc279497bc':
Only move to the next test in DRT after the test has completed AND the page has finished loading.
Merge commit 'f5a68512c3d0624584c3e6da1523863e401e49d0' into eclair-plus-aosp
* commit 'f5a68512c3d0624584c3e6da1523863e401e49d0':
First pass at pattern lock screen that includes date / time and carrier info (framework portion).
Merge commit 'bcef9ac35da08b9f7f8a4728af94c23a7a010669' into eclair-plus-aosp
* commit 'bcef9ac35da08b9f7f8a4728af94c23a7a010669':
add basic time stats for surfaces lock time
Merge commit '76f0111845f0886f522cfe1eb5ec1dee34181f7c' into eclair-plus-aosp
* commit '76f0111845f0886f522cfe1eb5ec1dee34181f7c':
Handle BACK key with focus in search ACTV correctly
Merge commit '74f79c1b2215525f8171551812b014bdb7cfba04' into eclair-plus-aosp
* commit '74f79c1b2215525f8171551812b014bdb7cfba04':
Fix a minor bug in is_alnum_string()...
