Merge commit '1b3a7b433cfca22f9e69d9103cae0ace216010b5'
* commit '1b3a7b433cfca22f9e69d9103cae0ace216010b5':
Make vCard exporter append neighborhood to locality field instead of extended address,
Merge commit '3003f30ddee0cb2f73d894a19bc1449fbe7cd601'
* commit '3003f30ddee0cb2f73d894a19bc1449fbe7cd601':
If overview width is the same as the current width,
Merge commit 'f1efe8e32a20855fa53a306053ef18c8ad9e2715'
* commit 'f1efe8e32a20855fa53a306053ef18c8ad9e2715':
-hide AccountManagerResponse, which never should have been exposed in the first place
Merge commit '904a4b7aaf270d4e58cb3bbb877a63559c760ee7'
* commit '904a4b7aaf270d4e58cb3bbb877a63559c760ee7':
Add Gservices flag so that Market can turn on performance logging for specific groups.
Merge commit 'eb114de5037bba89333bd7d57d305ae989727096' into eclair-mr2-plus-aosp
* commit 'eb114de5037bba89333bd7d57d305ae989727096':
Make vCard exporter append neighborhood to locality field instead of extended address,
Merge commit '98fdda09256072ae4f45a08ee40178b3ef643c9f' into eclair-mr2-plus-aosp
* commit '98fdda09256072ae4f45a08ee40178b3ef643c9f':
If overview width is the same as the current width,
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.
