Raphael
18fdba48ca
am 914c1ad1: am fa273bbf: am 7a42c8f4: am be4cbcc2: SDK Manager: fix NPE in AVD > Start when there\'s no skin name.
...
Merge commit '914c1ad15f93067e4d4e4df8a8aaeb4757d7c643'
* commit '914c1ad15f93067e4d4e4df8a8aaeb4757d7c643':
SDK Manager: fix NPE in AVD > Start when there's no skin name.
2009-10-29 20:09:21 -07:00
Brett Chabot
f765a429a1
am f09e872d: am 4ab62412: am da78534e: Merge change Ia94518e3 into eclair
...
Merge commit 'f09e872d7d1a72bd67a62707fea5a2239d83c6b1'
* commit 'f09e872d7d1a72bd67a62707fea5a2239d83c6b1':
ADT test fixes.
2009-10-29 20:09:15 -07:00
Raphael
8edfce56b6
am 9403f1ce: (-s ours) am 23e92c7d: am aad90b62: (-s ours) am 940073e2: (-s ours) Merge change I28aa1104 into eclair-sdk
...
Merge commit '9403f1ce47b6d869bd2107781bfe0dfa1b02e908'
* commit '9403f1ce47b6d869bd2107781bfe0dfa1b02e908':
SDK Updater: don't load sdk-repo XML that failed to validate. DO NOT MERGE.
2009-10-29 20:09:08 -07:00
Raphael
cf69ae64a6
am fabe8b0f: (-s ours) am ec176735: am 1a29f28e: (-s ours) am dd77d69f: (-s ours) Merge change I6b97fee0 into eclair-sdk
...
Merge commit 'fabe8b0f3fd42114f67ee97b5dc9a3191aead6a6'
* commit 'fabe8b0f3fd42114f67ee97b5dc9a3191aead6a6':
SDK Manager > AVD > Start: print computed scale. DO NOT MERGE.
2009-10-29 20:08:56 -07:00
Xavier Ducrohet
8f15408e9d
am dc7f152a: am f4513d58: am 8d7fa52a: am 3c5557bb: Merge change Idd4c6e5f into eclair-sdk
...
Merge commit 'dc7f152a6d191f583164efde28df42d06b8b03c2'
* commit 'dc7f152a6d191f583164efde28df42d06b8b03c2':
Move SDK tools package to r4
2009-10-29 20:08:49 -07:00
Xavier Ducrohet
fdcb679f83
am a20fa0d9: am aa02f40c: am f7f145dc: am 275de810: Merge change I2089d86d into eclair-sdk
...
Merge commit 'a20fa0d9398bfcd9b9b473a5040139e6ab0d6e52'
* commit 'a20fa0d9398bfcd9b9b473a5040139e6ab0d6e52':
Fix the android launcher script to not force Java 1.5 on MacOS
2009-10-29 20:08:41 -07:00
Mike Reed
0f38a137ab
am 16f13724: am 8d0b3af5: Merge change Ia8fe3f64 into eclair-mr2
...
Merge commit '16f13724adda3fbc382447937a2a3d65b7678e2e'
* commit '16f13724adda3fbc382447937a2a3d65b7678e2e':
add graphicslab test app
2009-10-29 20:08:31 -07:00
Dmitri Plotnikov
a883d5af06
am 7cb020a9: am 41c271bb: Merge change Iae0bc856 into eclair
...
Merge commit '7cb020a94773d7410e09cbc1743bfab80578f0e9' into eclair-mr2-plus-aosp
* commit '7cb020a94773d7410e09cbc1743bfab80578f0e9':
A sample application that demonstrates use of legacy and current contacts APIs.
2009-10-29 19:52:34 -07:00
Raphael
914c1ad15f
am fa273bbf: am 7a42c8f4: am be4cbcc2: SDK Manager: fix NPE in AVD > Start when there\'s no skin name.
...
Merge commit 'fa273bbf016bcd96e17a70b20962be997683b746' into eclair-mr2-plus-aosp
* commit 'fa273bbf016bcd96e17a70b20962be997683b746':
SDK Manager: fix NPE in AVD > Start when there's no skin name.
2009-10-29 19:52:28 -07:00
Brett Chabot
f09e872d7d
am 4ab62412: am da78534e: Merge change Ia94518e3 into eclair
...
Merge commit '4ab624121684ae57461ab85828eecc6de05cf64b' into eclair-mr2-plus-aosp
* commit '4ab624121684ae57461ab85828eecc6de05cf64b':
ADT test fixes.
2009-10-29 19:52:15 -07:00
Raphael
9403f1ce47
am 23e92c7d: am aad90b62: (-s ours) am 940073e2: (-s ours) Merge change I28aa1104 into eclair-sdk
...
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.
2009-10-29 19:52:09 -07:00
Raphael
fabe8b0f3f
am ec176735: am 1a29f28e: (-s ours) am dd77d69f: (-s ours) Merge change I6b97fee0 into eclair-sdk
...
Merge commit 'ec1767356bc2249387d0e60d20cf64d752d86ab2' into eclair-mr2-plus-aosp
* commit 'ec1767356bc2249387d0e60d20cf64d752d86ab2':
SDK Manager > AVD > Start: print computed scale. DO NOT MERGE.
2009-10-29 19:52:01 -07:00
Xavier Ducrohet
dc7f152a6d
am f4513d58: am 8d7fa52a: am 3c5557bb: Merge change Idd4c6e5f into eclair-sdk
...
Merge commit 'f4513d58e27c13d40494f41cfa11421e7c15ea59' into eclair-mr2-plus-aosp
* commit 'f4513d58e27c13d40494f41cfa11421e7c15ea59':
Move SDK tools package to r4
2009-10-29 19:51:54 -07:00
Xavier Ducrohet
a20fa0d939
am aa02f40c: am f7f145dc: am 275de810: Merge change I2089d86d into eclair-sdk
...
Merge commit 'aa02f40c1b32eb43c6b340300e4e4719c4975081' into eclair-mr2-plus-aosp
* commit 'aa02f40c1b32eb43c6b340300e4e4719c4975081':
Fix the android launcher script to not force Java 1.5 on MacOS
2009-10-29 19:51:46 -07:00
Mike Reed
16f13724ad
am 8d0b3af5: Merge change Ia8fe3f64 into eclair-mr2
...
Merge commit '8d0b3af557553992d8a4f1eab6567c6535544f92' into eclair-mr2-plus-aosp
* commit '8d0b3af557553992d8a4f1eab6567c6535544f92':
add graphicslab test app
2009-10-29 19:51:36 -07:00
Dmitri Plotnikov
7cb020a947
am 41c271bb: Merge change Iae0bc856 into eclair
...
Merge commit '41c271bb20ca14031405bda11e9dfd4b7bbc8a60' into eclair-mr2
* commit '41c271bb20ca14031405bda11e9dfd4b7bbc8a60':
A sample application that demonstrates use of legacy and current contacts APIs.
2009-10-29 19:32:52 -07:00
Raphael
fa273bbf01
am 7a42c8f4: am be4cbcc2: SDK Manager: fix NPE in AVD > Start when there\'s no skin name.
...
Merge commit '7a42c8f4d58306dfd2aa14d7d3ee52ebb54a19ae' into eclair-mr2
* commit '7a42c8f4d58306dfd2aa14d7d3ee52ebb54a19ae':
SDK Manager: fix NPE in AVD > Start when there's no skin name.
2009-10-29 19:32:40 -07:00
Brett Chabot
4ab6241216
am da78534e: Merge change Ia94518e3 into eclair
...
Merge commit 'da78534e3aefa41c7b76f6570cfcd7cea296325c' into eclair-mr2
* commit 'da78534e3aefa41c7b76f6570cfcd7cea296325c':
ADT test fixes.
2009-10-29 19:32:34 -07:00
Raphael
23e92c7d31
am aad90b62: (-s ours) am 940073e2: (-s ours) Merge change I28aa1104 into eclair-sdk
...
Merge commit 'aad90b62c73e6d44ed391fb24953021d0b45a768' into eclair-mr2
* commit 'aad90b62c73e6d44ed391fb24953021d0b45a768':
SDK Updater: don't load sdk-repo XML that failed to validate. DO NOT MERGE.
2009-10-29 19:31:07 -07:00
Raphael
ec1767356b
am 1a29f28e: (-s ours) am dd77d69f: (-s ours) Merge change I6b97fee0 into eclair-sdk
...
Merge commit '1a29f28e13c32fd8e62f08677c23d1d37644dd43' into eclair-mr2
* commit '1a29f28e13c32fd8e62f08677c23d1d37644dd43':
SDK Manager > AVD > Start: print computed scale. DO NOT MERGE.
2009-10-29 19:31:01 -07:00
Xavier Ducrohet
f4513d58e2
am 8d7fa52a: am 3c5557bb: Merge change Idd4c6e5f into eclair-sdk
...
Merge commit '8d7fa52af11670e2640b12466cc094960f0455b1' into eclair-mr2
* commit '8d7fa52af11670e2640b12466cc094960f0455b1':
Move SDK tools package to r4
2009-10-29 19:30:19 -07:00
Xavier Ducrohet
aa02f40c1b
am f7f145dc: am 275de810: Merge change I2089d86d into eclair-sdk
...
Merge commit 'f7f145dc0443ffa396304c2547ff9c15638c4dad' into eclair-mr2
* commit 'f7f145dc0443ffa396304c2547ff9c15638c4dad':
Fix the android launcher script to not force Java 1.5 on MacOS
2009-10-29 19:29:38 -07:00
Dmitri Plotnikov
58e183ef23
am 41c271bb: Merge change Iae0bc856 into eclair
...
Merge commit '41c271bb20ca14031405bda11e9dfd4b7bbc8a60' into eclair-plus-aosp
* commit '41c271bb20ca14031405bda11e9dfd4b7bbc8a60':
A sample application that demonstrates use of legacy and current contacts APIs.
2009-10-29 14:57:30 -07:00
Android (Google) Code Review
41c271bb20
Merge change Iae0bc856 into eclair
...
* changes:
A sample application that demonstrates use of legacy and current contacts APIs.
2009-10-29 17:49:26 -04:00
Raphael
e2825be473
am 7a42c8f4: am be4cbcc2: SDK Manager: fix NPE in AVD > Start when there\'s no skin name.
...
Merge commit '7a42c8f4d58306dfd2aa14d7d3ee52ebb54a19ae' into eclair-plus-aosp
* commit '7a42c8f4d58306dfd2aa14d7d3ee52ebb54a19ae':
SDK Manager: fix NPE in AVD > Start when there's no skin name.
2009-10-29 14:41:10 -07:00
Brett Chabot
658664e263
am da78534e: Merge change Ia94518e3 into eclair
...
Merge commit 'da78534e3aefa41c7b76f6570cfcd7cea296325c' into eclair-plus-aosp
* commit 'da78534e3aefa41c7b76f6570cfcd7cea296325c':
ADT test fixes.
2009-10-29 14:41:04 -07:00
Raphael
7a42c8f4d5
am be4cbcc2: SDK Manager: fix NPE in AVD > Start when there\'s no skin name.
...
Merge commit 'be4cbcc2267e3778776c68785b52f871f72c67f7' into eclair
* commit 'be4cbcc2267e3778776c68785b52f871f72c67f7':
SDK Manager: fix NPE in AVD > Start when there's no skin name.
2009-10-29 14:31:05 -07:00
Dmitri Plotnikov
5635cf46c1
A sample application that demonstrates use of legacy and current contacts APIs.
...
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
2009-10-29 14:23:44 -07:00
Raphael
be4cbcc226
SDK Manager: fix NPE in AVD > Start when there's no skin name.
...
Also log missing config.ini path.
SDK BUG 2223760
Change-Id: I4517005e03e90c0b5a52bcb40b0d32eddd03c1f3
2009-10-29 13:52:56 -07:00
Android (Google) Code Review
da78534e3a
Merge change Ia94518e3 into eclair
...
* changes:
ADT test fixes.
2009-10-29 16:45:53 -04:00
Raphael
4e1a5e36c6
am aad90b62: am 940073e2: (-s ours) Merge change I28aa1104 into eclair-sdk
...
Merge commit 'aad90b62c73e6d44ed391fb24953021d0b45a768' into eclair-plus-aosp
* commit 'aad90b62c73e6d44ed391fb24953021d0b45a768':
SDK Updater: don't load sdk-repo XML that failed to validate. DO NOT MERGE.
2009-10-29 13:41:32 -07:00
Raphael
86294adbb0
am 1a29f28e: am dd77d69f: (-s ours) Merge change I6b97fee0 into eclair-sdk
...
Merge commit '1a29f28e13c32fd8e62f08677c23d1d37644dd43' into eclair-plus-aosp
* commit '1a29f28e13c32fd8e62f08677c23d1d37644dd43':
SDK Manager > AVD > Start: print computed scale. DO NOT MERGE.
2009-10-29 13:41:26 -07:00
Raphael
aad90b62c7
am 940073e2: (-s ours) Merge change I28aa1104 into eclair-sdk
...
Merge commit '940073e267695a7c4a404cb2174b48e893c15a45' into eclair
* commit '940073e267695a7c4a404cb2174b48e893c15a45':
SDK Updater: don't load sdk-repo XML that failed to validate. DO NOT MERGE.
2009-10-29 13:30:46 -07:00
Raphael
1a29f28e13
am dd77d69f: (-s ours) Merge change I6b97fee0 into eclair-sdk
...
Merge commit 'dd77d69f9e8eca2bd81f418f867d1b4b3bd6462e' into eclair
* commit 'dd77d69f9e8eca2bd81f418f867d1b4b3bd6462e':
SDK Manager > AVD > Start: print computed scale. DO NOT MERGE.
2009-10-29 13:30:39 -07:00
Android (Google) Code Review
940073e267
Merge change I28aa1104 into eclair-sdk
...
* changes:
SDK Updater: don't load sdk-repo XML that failed to validate. DO NOT MERGE.
2009-10-29 16:22:26 -04:00
Xavier Ducrohet
3b089ad89e
am 8d7fa52a: am 3c5557bb: Merge change Idd4c6e5f into eclair-sdk
...
Merge commit '8d7fa52af11670e2640b12466cc094960f0455b1' into eclair-plus-aosp
* commit '8d7fa52af11670e2640b12466cc094960f0455b1':
Move SDK tools package to r4
2009-10-29 13:19:58 -07:00
Android (Google) Code Review
dd77d69f9e
Merge change I6b97fee0 into eclair-sdk
...
* changes:
SDK Manager > AVD > Start: print computed scale. DO NOT MERGE.
2009-10-29 16:14:35 -04:00
Xavier Ducrohet
8d7fa52af1
am 3c5557bb: Merge change Idd4c6e5f into eclair-sdk
...
Merge commit '3c5557bb5e9235737c4c7ddda4c66f14396105cf' into eclair
* commit '3c5557bb5e9235737c4c7ddda4c66f14396105cf':
Move SDK tools package to r4
2009-10-29 13:09:24 -07:00
Android (Google) Code Review
3c5557bb5e
Merge change Idd4c6e5f into eclair-sdk
...
* changes:
Move SDK tools package to r4
2009-10-29 16:00:32 -04:00
Raphael
93ead92dbb
SDK Manager > AVD > Start: print computed scale. 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
2009-10-29 13:00:11 -07:00
Raphael
34d8e2790b
SDK Updater: don't load sdk-repo XML that failed to validate. DO NOT MERGE.
...
This also prints a more obvious message in case Java doesn't
have an XML Schema validator.
SDK BUGS 2219284 2198427
Change-Id: I28aa1104957d2fe7791dcf0377a42d37f777a19d
2009-10-29 12:56:16 -07:00
Xavier Ducrohet
eb6a540f3a
am f7f145dc: am 275de810: Merge change I2089d86d into eclair-sdk
...
Merge commit 'f7f145dc0443ffa396304c2547ff9c15638c4dad' into eclair-plus-aosp
* commit 'f7f145dc0443ffa396304c2547ff9c15638c4dad':
Fix the android launcher script to not force Java 1.5 on MacOS
2009-10-29 12:47:19 -07:00
Xavier Ducrohet
f7f145dc04
am 275de810: Merge change I2089d86d into eclair-sdk
...
Merge commit '275de810e99814cefd11321fd934bda1a4b53cc9' into eclair
* commit '275de810e99814cefd11321fd934bda1a4b53cc9':
Fix the android launcher script to not force Java 1.5 on MacOS
2009-10-29 12:39:03 -07:00
Android (Google) Code Review
8d0b3af557
Merge change Ia8fe3f64 into eclair-mr2
...
* changes:
add graphicslab test app
2009-10-29 15:31:48 -04:00
Mike Reed
a8fe3f6431
add graphicslab test app
2009-10-29 15:31:08 -04:00
Android (Google) Code Review
275de810e9
Merge change I2089d86d into eclair-sdk
...
* changes:
Fix the android launcher script to not force Java 1.5 on MacOS
2009-10-29 15:28:07 -04:00
Xavier Ducrohet
dd4c6e5f3e
Move SDK tools package to r4
2009-10-29 12:27:50 -07:00
Xavier Ducrohet
7bb72933c5
Fix the android launcher script to not force Java 1.5 on MacOS
2009-10-29 12:15:02 -07:00
Raphael
71e0156dd6
am 3a58ebb3: am f8c770bb: am 107b1a9e: Merge change Ie496edfa into eclair
...
Merge commit '3a58ebb389272896ee595a56e46486017bcf2c0c'
* commit '3a58ebb389272896ee595a56e46486017bcf2c0c':
SDK Updater: don't load sdk-repo XML that failed to validate.
2009-10-29 01:49:00 -07:00
Raphael
2e98e8c031
am 7d2bb73d: am b242a1de: am 09c5201a: Prepare version numbers for next SDK & tools
...
Merge commit '7d2bb73d2039e4acb2b8a9d9bdb3a1ce968a4d59'
* commit '7d2bb73d2039e4acb2b8a9d9bdb3a1ce968a4d59':
Prepare version numbers for next SDK & tools
2009-10-29 01:48:54 -07:00
