Merge commit 'f61ab00770c6010d83280644263d6f530c75028e' into eclair-mr2-plus-aosp
* commit 'f61ab00770c6010d83280644263d6f530c75028e':
-hide AccountManagerResponse, which never should have been exposed in the first place
Also sets an explicit type for GeolocationPermissions.getOrigins.
This is a partial fix for bug http://b/issue?id=2271636
Change-Id: Ife478917a979b68e242c467798358a018455957f
Merge commit '5994cd2898ad3c76d1f5068137a884024f521163' into eclair-mr2
* commit '5994cd2898ad3c76d1f5068137a884024f521163':
-hide AccountManagerResponse, which never should have been exposed in the first place
Merge commit '8250530c507653d57c768677d8a542cd769aaf99' into eclair-mr2-plus-aosp
* commit '8250530c507653d57c768677d8a542cd769aaf99':
Add Gservices flag so that Market can turn on performance logging for specific groups.
Merge commit 'b0fbb7cc15a2b383b4fe1dde8117254b2056573b' into eclair-mr2-plus-aosp
* commit 'b0fbb7cc15a2b383b4fe1dde8117254b2056573b':
Update JavaDoc for CacheManger.CacheResult, WebChromeClient.getDefaultVideoPoster and WebChromeClient.getVideoLoadingProgressView.
Merge commit '35e8de89551825ca19f069d029757ecd852661a4'
* commit '35e8de89551825ca19f069d029757ecd852661a4':
When requesting the href of a link, also request the link's text.
Merge commit '0a784a545303cc5fcd9ecbc260d1fa0d0d0b8336' into eclair-mr2-plus-aosp
* commit '0a784a545303cc5fcd9ecbc260d1fa0d0d0b8336':
When requesting the href of a link, also request the link's text.
Merge commit 'e922751eb6d5e19a4c85dc92d57fddb7ccff7808'
* commit 'e922751eb6d5e19a4c85dc92d57fddb7ccff7808':
Make vCard code refrain from using NEIGHBORHOOD field when importing.
Merge commit '6a942dbe51b52ce41903e236d5db294274bb0dd2' into eclair-mr2-plus-aosp
* commit '6a942dbe51b52ce41903e236d5db294274bb0dd2':
Make vCard code refrain from using NEIGHBORHOOD field when importing.
Merge commit '5b2f5ced25aee6fec49ffd30abeca2801c98fbd8'
* commit '5b2f5ced25aee6fec49ffd30abeca2801c98fbd8':
Modify vCard exporter code so that it does not emit non-Ascii type.
Merge commit '5d81e8c82aa8d55eff2c2c78e4a553c479332187'
* commit '5d81e8c82aa8d55eff2c2c78e4a553c479332187':
Workaround for 2262578: Don't draw tabs if view is not in the correct orientation for the layout
Merge commit '41029cf413abbfdf004e04f192a440e457701c47'
* commit '41029cf413abbfdf004e04f192a440e457701c47':
Fix for 2267410 : Battery use doesn't show CPU usage on non-wiped devices
Merge commit 'ddd017f872bee40450c0e73dcf6608a9fdc49a05' into eclair-mr2-plus-aosp
* commit 'ddd017f872bee40450c0e73dcf6608a9fdc49a05':
Modify vCard exporter code so that it does not emit non-Ascii type.
Add optional flag to Wakelock.release() to specify whether we should wait for proximity sensor to go negative before turning on the screen.
Clear the "waiting for proximity sensor to go negative" state when the power key is pressed.
Part of the fix for b/2243198 (Black screen lockup after ending call)
Change-Id: I813fdb7aa4192cd3384a25be9e59d7d4b90da53a
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '4373346073250b668c0ff287b0d584401f7f3c96' into eclair-mr2-plus-aosp
* commit '4373346073250b668c0ff287b0d584401f7f3c96':
Workaround for 2262578: Don't draw tabs if view is not in the correct orientation for the layout
Merge commit '30142f7ef7bf3d4699526cb9ce02b220a8045c5d' into eclair-mr2
* commit '30142f7ef7bf3d4699526cb9ce02b220a8045c5d':
Workaround for 2262578: Don't draw tabs if view is not in the correct orientation for the layout
Merge commit '9335d414bd2af5bb1ad74459de165a3d93a9ca7b' into eclair-mr2-plus-aosp
* commit '9335d414bd2af5bb1ad74459de165a3d93a9ca7b':
Fix for 2267410 : Battery use doesn't show CPU usage on non-wiped devices
Merge commit '778f1e65a5ea37bc4adc4725e281a34b775bc72d' into eclair-mr2
* commit '778f1e65a5ea37bc4adc4725e281a34b775bc72d':
Fix for 2267410 : Battery use doesn't show CPU usage on non-wiped devices
Merge commit '8c7d9eab8aa297f5ee3a171c6fa63fcf94e2b330' into eclair-mr2-plus-aosp
* commit '8c7d9eab8aa297f5ee3a171c6fa63fcf94e2b330':
Create android-common static library which gets included in frameworks.jar,
