Merge commit '68b4bfa8d3217b6598689acde25b5dc4672c53a0'
* commit '68b4bfa8d3217b6598689acde25b5dc4672c53a0':
1. Add .c extension to native_test.py so that native test in C can also be picked up by testrunner.
Merge commit 'b74479296bbdba52c75e83c9509fd232e563babb'
* commit 'b74479296bbdba52c75e83c9509fd232e563babb':
Add OSGi.jar to the SDK (required by org.eclipse.jface)
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 'd41eb690ed8f190745c79fd3488a60a65577863b'
* commit 'd41eb690ed8f190745c79fd3488a60a65577863b':
Make sure that the android pref folder is always present when queried.
Merge commit '7cf5e53901a04c23bf19c2ffa502a3bacaa77412'
* commit '7cf5e53901a04c23bf19c2ffa502a3bacaa77412':
Make the Ant script sign and zipalign release builds.
Merge commit '1cd05e68aa2bab597569c04f9e4cb12d131ee419'
* commit '1cd05e68aa2bab597569c04f9e4cb12d131ee419':
Update the version of the tools/docs/platforms
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 '6c7a34862fbfe3cd09bca81f3053bdbc89d0ab78'
* commit '6c7a34862fbfe3cd09bca81f3053bdbc89d0ab78':
Add support for the new qualifier in the config selector.
Merge commit '0d223cab6aa4912cfba11a9ccf8f2fcb7bb3218e' into eclair
* commit '0d223cab6aa4912cfba11a9ccf8f2fcb7bb3218e':
Add support for the new qualifier in the config selector.
Merge commit 'bb57ac8ccfa18c7df38f42f519821c0083875abf'
* commit 'bb57ac8ccfa18c7df38f42f519821c0083875abf':
do not merge: cherrypicked a83a03bbf0 and a076d0dbd1 from master branch
Merge commit '6d88a98af4be122a8d8945e8da22ae9f45779622'
* commit '6d88a98af4be122a8d8945e8da22ae9f45779622':
Add a functional test that renders all the layouts of ApiDemos
Merge commit 'de1a5e380b4d5c567083d34f3840c6d277268c08'
* commit 'de1a5e380b4d5c567083d34f3840c6d277268c08':
On project creation, put the app package in build.properties
Merge commit '8a6310d0e5a284007cbf81a4f260b019366045af'
* commit '8a6310d0e5a284007cbf81a4f260b019366045af':
Also display error on empty minSdkVersion for preview targets.
Merge commit '0cef5c4666b9c77161421c8a52b7dddff42f12da' into eclair
* commit '0cef5c4666b9c77161421c8a52b7dddff42f12da':
Add a functional test that renders all the layouts of ApiDemos
