Merge commit 'f765a70ac7dd8aabbaca696af5860c2bffdf8df0' into eclair-plus-aosp
* commit 'f765a70ac7dd8aabbaca696af5860c2bffdf8df0':
Update adt-tests build.properties to include new test data location.
Merge commit '534b520e4add964f75cf6a8a612b54916d46da2e' into eclair-plus-aosp
* commit '534b520e4add964f75cf6a8a612b54916d46da2e':
Fix ADT test data references.
Currently you need to use the Refresh button in the remote page
after you change the HTTP/s setting and many users think
instead they need to close/restart the SDK manager.
Change-Id: Ic291d53459624558910bbc417295df5ddc7b037d
Merge commit 'bf9a70fb1beb15944cb47d267c7b15ab699dca63' into eclair-plus-aosp
* commit 'bf9a70fb1beb15944cb47d267c7b15ab699dca63':
SDK: fix NPE in AVD Manager > Start when skin.path is missing.
Merge commit 'ca4603db2fa5cd0231d75ebcef239cd69e1772ad' into eclair
* commit 'ca4603db2fa5cd0231d75ebcef239cd69e1772ad':
SDK: fix NPE in AVD Manager > Start when skin.path is missing.
Merge commit '396a10e48d7201215e54821fa0d7901ffde3a30a' into eclair-plus-aosp
* commit '396a10e48d7201215e54821fa0d7901ffde3a30a':
ADT now launches app as if launched from launcher.
Merge commit '7853d243aa0f2947249aa610972d74622cdddd82' into eclair-plus-aosp
* commit '7853d243aa0f2947249aa610972d74622cdddd82':
Move Tools to rev 5, and ADT to 0.9.5
- Remove reference to ADT from sdklib tests.
- Move ADT test data to be closer to their test classes, and to make it obvious
this data is only for ADT unit tests.
Merge commit '03684b9d88cfa8f9775685d7a4efed2c96a57932' into eclair-plus-aosp
* commit '03684b9d88cfa8f9775685d7a4efed2c96a57932':
SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts
Merge commit '4bf2ce27a00c564daf0831c16769ee1ca259ddc7' into eclair
* commit '4bf2ce27a00c564daf0831c16769ee1ca259ddc7':
SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts
Merge commit 'f9e0b264422d086066a9d9deb2118617735e8d65' into eclair-plus-aosp
* commit 'f9e0b264422d086066a9d9deb2118617735e8d65':
Move check for hidden files in the proper method.
Merge commit '8d700bdf67681ad405819c06906325768f8cf9ea' into eclair-plus-aosp
* commit '8d700bdf67681ad405819c06906325768f8cf9ea':
SDK: fix build. checkFileForPackaging is used by ApkBuilder.
Merge commit 'f31f630320a53e067ead2848d24ff63b0e0ad3b0' into eclair-plus-aosp
* commit 'f31f630320a53e067ead2848d24ff63b0e0ad3b0':
Ignore hidden files and vi swap files during packaging.
Merge commit '192d5db1fedef99404644256f80740bb3763b049' into eclair-plus-aosp
* commit '192d5db1fedef99404644256f80740bb3763b049':
Only apply permission to files with +x
This displays the scale computed by AVD Start.
I find it more intuitive to use if I see what the
emulator will be called with.
Change-Id: I6b97fee06bd4e6dc36c977ffef3c25315469b766
This also prints a more obvious message in case Java doesn't
have an XML Schema validator.
SDK BUGS 2219284 2198427
Change-Id: I28aa1104957d2fe7791dcf0377a42d37f777a19d
Merge commit 'f7f145dc0443ffa396304c2547ff9c15638c4dad' into eclair-plus-aosp
* commit 'f7f145dc0443ffa396304c2547ff9c15638c4dad':
Fix the android launcher script to not force Java 1.5 on MacOS
Merge commit '275de810e99814cefd11321fd934bda1a4b53cc9' into eclair
* commit '275de810e99814cefd11321fd934bda1a4b53cc9':
Fix the android launcher script to not force Java 1.5 on MacOS
Temporarily remove SampleProjectTest from continuous, since its failing at
every CL.
Adjust ApiDemosRenderingTest to use the SDK loaded by ADT.
Remove SdkEnvTestCase since it doesn't work in all situations.
Fix test data lookup for NinePatchTest and BridgeXmlBlockParserTest.
Bugs 2222616, 2218682