Merge commit '4ee476ef94f7834c18ee378c788abcdb0728954f'
* commit '4ee476ef94f7834c18ee378c788abcdb0728954f':
Fix a problem in which Android custom fields are not emitted correctly in non-Ascii languages.
Merge commit '5e332efd56ffc8bcc6c40b214aca66bec21648b7' into eclair-mr2-plus-aosp
* commit '5e332efd56ffc8bcc6c40b214aca66bec21648b7':
Fix a problem in which Android custom fields are not emitted correctly in non-Ascii languages.
Merge commit '043c72766248d0a4783c506fd4f604ed63e763d4'
* commit '043c72766248d0a4783c506fd4f604ed63e763d4':
fix bad link in javadoc that's breaking SDK build
Merge commit '6fd4e76ca1866772d125089e8f2e3f1d54fcae08' into eclair-mr2-plus-aosp
* commit '6fd4e76ca1866772d125089e8f2e3f1d54fcae08':
fix bad link in javadoc that's breaking SDK build
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.
In order to unbundle System Update, we need some to expose in the SDK
some way to reboot the device into recovery. Add a reboot() method to
PowerManager, protected by the android.permission.REBOOT permission.
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.
