Merge commit 'e95a86cfec18836ddbff149690a13766bfc9ada3' into eclair
* commit 'e95a86cfec18836ddbff149690a13766bfc9ada3':
Fix target for ApiDemos (API is now 4)
Merge commit '3e83e8bc8b969a993b026dab9d13b99b315d9af0' into eclair
* commit '3e83e8bc8b969a993b026dab9d13b99b315d9af0':
Remove SearchableDictionary sample app as it is a demo of third party inclusion in quick search box.
At one time during the development of GLSurfaceView, the
GLSurfaceView.Renderer interface had a getConfigSpec method that was used to
select the frame buffer format. This method was removed from the
Renderer interface before GLSurfaceView became a public API, but
the sample code still defined these now-unused methods.
To reduce the chance of confusing a developer who uses the sample code,
this change removes the dead, no-longer-called getConfigSpec
implementations from the three samples.
See GLSurfaceView.setEGLConfigChooser for the replacement
technique.
Merge commit '8fccf9eb7c099a42729d0ff4a8a250f73a68c3f9' into eclair
* commit '8fccf9eb7c099a42729d0ff4a8a250f73a68c3f9':
mgwz.dll must be packaged next to tools/zipalign.exe in the Windows SDK.
Merge commit 'fab096cbcf98cb98eef25e7541121ae8e3898a10' into eclair
* commit 'fab096cbcf98cb98eef25e7541121ae8e3898a10':
new transparent icon for searchable dictionary
Merge commit 'c7d0cec7e83d5194c35e88b17d3acc937fa87511' into eclair
* commit 'c7d0cec7e83d5194c35e88b17d3acc937fa87511':
Fix broken XML generated during "Extract string"
Merge commit 'a457ef41e82b67a31a06f6ffb602cd39c43a1018' into eclair
* commit 'a457ef41e82b67a31a06f6ffb602cd39c43a1018':
Add OS version to ping service (win/mac only)
Merge commit 'd271d9a503b181b240250ce2664ff22fbf4e763b' into eclair
* commit 'd271d9a503b181b240250ce2664ff22fbf4e763b':
Enable adb forwarding and starting up of monkey server
Merge commit '9a7b2700fd015252f59a25524f8f6231f9bb1fc4' into eclair
* commit '9a7b2700fd015252f59a25524f8f6231f9bb1fc4':
Make SSL error a bit more human readable.
Merge commit '1230661e50f72c6fa32ce60c20094631c34d5ec6' into eclair
* commit '1230661e50f72c6fa32ce60c20094631c34d5ec6':
Add getvar and listvar commands to monkey to allow inspection of properties on the device.
Merge commit '12ad9fb10e1be799fa47a56ee1f1429b761db6e6' into eclair
* commit '12ad9fb10e1be799fa47a56ee1f1429b761db6e6':
1. Add .c extension to native_test.py so that native test in C can also be picked up by testrunner.
Merge commit '25ec799863219bfa1b5b8c71b5033cb450e70918' into eclair
* commit '25ec799863219bfa1b5b8c71b5033cb450e70918':
Add OSGi.jar to the SDK (required by org.eclipse.jface)
Merge commit '788aa67d1a3a94565b6209a07a023dca182b9b99' into eclair
* commit '788aa67d1a3a94565b6209a07a023dca182b9b99':
Bump release version to android-1.6_r1
Merge commit 'f07bd569c361969e64aaebd9da1ddab15d86d425' into eclair
* commit 'f07bd569c361969e64aaebd9da1ddab15d86d425':
Codename in minsdkversion for release platform shows 'null' in error string
Merge commit '49ac0f9df009ace5175267ad60be51114ee19817' into eclair
* commit '49ac0f9df009ace5175267ad60be51114ee19817':
Make sure that the android pref folder is always present when queried.
Merge commit 'afd9ae8e9b3581203806dbba503233be2f768f9f' into eclair
* commit 'afd9ae8e9b3581203806dbba503233be2f768f9f':
Make the Ant script sign and zipalign release builds.
Merge commit 'ac0faba93338aa49cb5f71650e43de09a44e6b0e' into eclair
* commit 'ac0faba93338aa49cb5f71650e43de09a44e6b0e':
Update the version of the tools/docs/platforms
Merge commit '0d223cab6aa4912cfba11a9ccf8f2fcb7bb3218e' into eclair
* commit '0d223cab6aa4912cfba11a9ccf8f2fcb7bb3218e':
Add support for the new qualifier in the config selector.