Merge commit 'e614f9382799826ca11960eb8ffacb677e2a2b1b'
* commit 'e614f9382799826ca11960eb8ffacb677e2a2b1b':
Don't feed the timezone to RenderScript time functions, let the library figure it out.
Merge commit '2cd22586ab5c16a5caaeb4ec7114b040e07fd6bc'
* commit '2cd22586ab5c16a5caaeb4ec7114b040e07fd6bc':
Do not force screen on when undocking from the desk dock.
Merge commit 'f291a68dbff5fb74696204b2a0bc49d5eba67c93'
* commit 'f291a68dbff5fb74696204b2a0bc49d5eba67c93':
don't request a sync when temp providers are created
Merge commit 'c536bea4df43196a9ec3f20aee5b3cc1509fe6c0'
* commit 'c536bea4df43196a9ec3f20aee5b3cc1509fe6c0':
Use getViewHeightWithTitle() to honor the scrollbar
Merge commit 'ebecde29c56778534d619af867d0042d5337b066'
* commit 'ebecde29c56778534d619af867d0042d5337b066':
Use computeVerticalScrollRange() to find the bottom
Merge commit 'df296b72fc215c2beb5eca92a4c66f71a1b8e7bd'
* commit 'df296b72fc215c2beb5eca92a4c66f71a1b8e7bd':
Return an empty PluginList instead of null for the
Merge commit 'ad902f06dd44e30286c48c8a28bb2509b80c63bc'
* commit 'ad902f06dd44e30286c48c8a28bb2509b80c63bc':
Fix for 2209086: Initial pass at new SlidingTab widget and integration into LockScreen.
Merge commit 'dfaec0d987f8f8e8822f554020795bea090e96c1'
* commit 'dfaec0d987f8f8e8822f554020795bea090e96c1':
Throttle nitz updates as the are too numerous on cdma.
Merge commit '3bfca6a3a78dee6ff695e4a1b273a939109b07ac'
* commit '3bfca6a3a78dee6ff695e4a1b273a939109b07ac':
Fix issue #2248951: Need to turn off touch filtering outside of sholes
Merge commit '462e56eb2752f9fe28d93debb70badd6a32e7d47'
* commit '462e56eb2752f9fe28d93debb70badd6a32e7d47':
Make vCard parser invalid lines in vCard file which look like some comment. Do not merge.
Merge commit 'b56679a9e4e8ed0e2c626cd7f1f7655fab7e61dc'
* commit 'b56679a9e4e8ed0e2c626cd7f1f7655fab7e61dc':
Make vCard exporter check invalid phone numbers and re-format them if needed. Do not merge.
Merge commit 'a4b8a30ccb3669eaa13eb848b59f6c3faa12b282'
* commit 'a4b8a30ccb3669eaa13eb848b59f6c3faa12b282':
Backport the change I30b141a2 from MR2 to MR1. Do not merge.
Merge commit 'dac92e6fb6a29d827b9cbee7712ca07218bb55da' into eclair-mr2-plus-aosp
* commit 'dac92e6fb6a29d827b9cbee7712ca07218bb55da':
Don't feed the timezone to RenderScript time functions, let the library figure it out.
Merge commit 'ad99c2876cf57a61829ac0b03ee48fa86a51da6b' into eclair-mr2-plus-aosp
* commit 'ad99c2876cf57a61829ac0b03ee48fa86a51da6b':
Do not force screen on when undocking from the desk dock.
Merge commit 'd73f7de40e1bdd0d8aee1ee793db36e7a9f7d8cb' into eclair-mr2-plus-aosp
* commit 'd73f7de40e1bdd0d8aee1ee793db36e7a9f7d8cb':
don't request a sync when temp providers are created
Merge commit '6d559f9d5688b3e2b027e6fbd5c5cf4f0efbfc09' into eclair-mr2-plus-aosp
* commit '6d559f9d5688b3e2b027e6fbd5c5cf4f0efbfc09':
Use getViewHeightWithTitle() to honor the scrollbar
Merge commit '9f4baf308daebbad0d3a634b158f3eb4ae532d39' into eclair-mr2-plus-aosp
* commit '9f4baf308daebbad0d3a634b158f3eb4ae532d39':
Use computeVerticalScrollRange() to find the bottom
Merge commit '09550fde489a6d5155f005fec9b328f1b2a878a6' into eclair-mr2-plus-aosp
* commit '09550fde489a6d5155f005fec9b328f1b2a878a6':
Return an empty PluginList instead of null for the
Merge commit '052908a5d93f3d842cd7a9d8eda5acd3d9565b69' into eclair-mr2-plus-aosp
* commit '052908a5d93f3d842cd7a9d8eda5acd3d9565b69':
Fix for 2209086: Initial pass at new SlidingTab widget and integration into LockScreen.
Merge commit 'f7394fcaedbbf84f7934d0bfcc157948a2d5c166' into eclair-mr2-plus-aosp
* commit 'f7394fcaedbbf84f7934d0bfcc157948a2d5c166':
Throttle nitz updates as the are too numerous on cdma.
Merge commit 'e0751066b05eda8532b7c7d9d55003796490e334' into eclair-mr2-plus-aosp
* commit 'e0751066b05eda8532b7c7d9d55003796490e334':
Fix issue #2248951: Need to turn off touch filtering outside of sholes
Merge commit '2a7b0b996fba30cb57062559773e8855c8cf1b9e' into eclair-mr2-plus-aosp
* commit '2a7b0b996fba30cb57062559773e8855c8cf1b9e':
Make vCard parser invalid lines in vCard file which look like some comment. Do not merge.
Merge commit '8940d5768271b0615aff65b706b70823201f7995' into eclair-mr2-plus-aosp
* commit '8940d5768271b0615aff65b706b70823201f7995':
Make vCard exporter check invalid phone numbers and re-format them if needed. Do not merge.
Merge commit '49fc4a9dd39e520d87fd2b9f1a20263570221ebe' into eclair-mr2-plus-aosp
* commit '49fc4a9dd39e520d87fd2b9f1a20263570221ebe':
Backport the change I30b141a2 from MR2 to MR1. Do not merge.
Merge commit '3e584fc944e3d694b4233450f386bd2a930420bf' into eclair-mr2
* commit '3e584fc944e3d694b4233450f386bd2a930420bf':
Don't feed the timezone to RenderScript time functions, let the library figure it out.
Merge commit 'f1f26bbb2aa36f69f0efcac21ea27b1055b98a11' into eclair-mr2
* commit 'f1f26bbb2aa36f69f0efcac21ea27b1055b98a11':
Do not force screen on when undocking from the desk dock.
Merge commit '4cb6fc7ed2e4371b7ea4d053064fbeb3f86cfc20' into eclair-mr2
* commit '4cb6fc7ed2e4371b7ea4d053064fbeb3f86cfc20':
don't request a sync when temp providers are created
Merge commit 'bf5b632abbc2f4b96323ff428be585fd2a3d381c' into eclair-mr2
* commit 'bf5b632abbc2f4b96323ff428be585fd2a3d381c':
Use getViewHeightWithTitle() to honor the scrollbar
Merge commit 'd7439f4bdb31d005011b69112e82a9fed9be4470' into eclair-mr2
* commit 'd7439f4bdb31d005011b69112e82a9fed9be4470':
Use computeVerticalScrollRange() to find the bottom
Merge commit 'c996689109b1ac0849aa675e1987e3851ee77a95' into eclair-mr2
* commit 'c996689109b1ac0849aa675e1987e3851ee77a95':
Return an empty PluginList instead of null for the
Merge commit '2f92bd3ecb45e2690dcdc9c09564a1b3805f673b' into eclair-mr2
* commit '2f92bd3ecb45e2690dcdc9c09564a1b3805f673b':
Fix for 2209086: Initial pass at new SlidingTab widget and integration into LockScreen.
Merge commit '38210df337a1485bd3d2eb5adc223f443fe1b5b0' into eclair-mr2
* commit '38210df337a1485bd3d2eb5adc223f443fe1b5b0':
Throttle nitz updates as the are too numerous on cdma.
Merge commit '250aa068eae7424d454fc65ea83c8a65ca717112' into eclair-mr2
* commit '250aa068eae7424d454fc65ea83c8a65ca717112':
Fix issue #2248951: Need to turn off touch filtering outside of sholes
Merge commit 'b9c40a65c7fb2121d3076a522248574162bf5f8c' into eclair-mr2
* commit 'b9c40a65c7fb2121d3076a522248574162bf5f8c':
Make vCard parser invalid lines in vCard file which look like some comment. Do not merge.
Merge commit 'e464de6b764348a102ae64417d22bbd1c80723dc' into eclair-mr2
* commit 'e464de6b764348a102ae64417d22bbd1c80723dc':
Make vCard exporter check invalid phone numbers and re-format them if needed. Do not merge.
Merge commit '7efa671569955aead877d10e7d6b1fa3129184a4'
* commit '7efa671569955aead877d10e7d6b1fa3129184a4':
Make the RegisteredSErvices Cache not allow the registered service for a
Merge commit 'fe17db4c023ea39dcbd971d64c3a5bcc6dd6fab9' into eclair-mr2
* commit 'fe17db4c023ea39dcbd971d64c3a5bcc6dd6fab9':
Backport the change I30b141a2 from MR2 to MR1. Do not merge.
Merge commit 'e871be666b80d3f6a9a9a44ee400ab661be212e4' into eclair-mr2-plus-aosp
* commit 'e871be666b80d3f6a9a9a44ee400ab661be212e4':
Make the RegisteredSErvices Cache not allow the registered service for a
