Merge commit 'a20fa0d9398bfcd9b9b473a5040139e6ab0d6e52'
* commit 'a20fa0d9398bfcd9b9b473a5040139e6ab0d6e52':
Fix the android launcher script to not force Java 1.5 on MacOS
Merge commit '7cb020a94773d7410e09cbc1743bfab80578f0e9' into eclair-mr2-plus-aosp
* commit '7cb020a94773d7410e09cbc1743bfab80578f0e9':
A sample application that demonstrates use of legacy and current contacts APIs.
Merge commit '23e92c7d3187e8c29a02ef82c666b84380557eff' into eclair-mr2-plus-aosp
* commit '23e92c7d3187e8c29a02ef82c666b84380557eff':
SDK Updater: don't load sdk-repo XML that failed to validate. DO NOT MERGE.
Merge commit 'aa02f40c1b32eb43c6b340300e4e4719c4975081' into eclair-mr2-plus-aosp
* commit 'aa02f40c1b32eb43c6b340300e4e4719c4975081':
Fix the android launcher script to not force Java 1.5 on MacOS
Merge commit '41c271bb20ca14031405bda11e9dfd4b7bbc8a60' into eclair-mr2
* commit '41c271bb20ca14031405bda11e9dfd4b7bbc8a60':
A sample application that demonstrates use of legacy and current contacts APIs.
Merge commit 'aad90b62c73e6d44ed391fb24953021d0b45a768' into eclair-mr2
* commit 'aad90b62c73e6d44ed391fb24953021d0b45a768':
SDK Updater: don't load sdk-repo XML that failed to validate. DO NOT MERGE.
Merge commit 'f7f145dc0443ffa396304c2547ff9c15638c4dad' into eclair-mr2
* commit 'f7f145dc0443ffa396304c2547ff9c15638c4dad':
Fix the android launcher script to not force Java 1.5 on MacOS
The application provides two implementations for access to contacts, one based
on legacy API, the other based on the current API. The correct implementation
is chosen at runtime based on the version of the SDK.
Change-Id: Iae0bc8564be420ff504a5dc760b935630a7664e6
Merge commit '940073e267695a7c4a404cb2174b48e893c15a45' into eclair
* commit '940073e267695a7c4a404cb2174b48e893c15a45':
SDK Updater: don't load sdk-repo XML that failed to validate. DO NOT MERGE.
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 '275de810e99814cefd11321fd934bda1a4b53cc9' into eclair
* commit '275de810e99814cefd11321fd934bda1a4b53cc9':
Fix the android launcher script to not force Java 1.5 on MacOS
Merge commit '7d2bb73d2039e4acb2b8a9d9bdb3a1ce968a4d59'
* commit '7d2bb73d2039e4acb2b8a9d9bdb3a1ce968a4d59':
Prepare version numbers for next SDK & tools
Merge commit 'f8c770bbd504dfa05fd5ef1398c7e7d8b0290144' into eclair-mr2-plus-aosp
* commit 'f8c770bbd504dfa05fd5ef1398c7e7d8b0290144':
SDK Updater: don't load sdk-repo XML that failed to validate.
Merge commit 'b242a1dea689d6d9de6f9d70af2126025e00ddad' into eclair-mr2-plus-aosp
* commit 'b242a1dea689d6d9de6f9d70af2126025e00ddad':
Prepare version numbers for next SDK & tools
Merge commit '107b1a9ee6c8e96027bec7a0caf16f723efd39ce' into eclair-mr2
* commit '107b1a9ee6c8e96027bec7a0caf16f723efd39ce':
SDK Updater: don't load sdk-repo XML that failed to validate.
Merge commit '09c5201adca0ceb0e881832d53cfa9e412d07389' into eclair-mr2
* commit '09c5201adca0ceb0e881832d53cfa9e412d07389':
Prepare version numbers for next SDK & tools
Merge commit 'c02e450461779ae16708e337ad7f4eb515cfc3e0'
* commit 'c02e450461779ae16708e337ad7f4eb515cfc3e0':
ADT/GEL: Reenable config popup when switching from a device with only 1 config
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
