LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,944 Commits 2 Branches 0 Tags
8edfce56b6498f56bfbda7cd288cd89cf1318bd6
Commit Graph

2944 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
Raphael
3a58ebb389 am f8c770bb: am 107b1a9e: Merge change Ie496edfa into eclair 
Merge commit 'f8c770bbd504dfa05fd5ef1398c7e7d8b0290144' into eclair-mr2-plus-aosp

* commit 'f8c770bbd504dfa05fd5ef1398c7e7d8b0290144':
  SDK Updater: don't load sdk-repo XML that failed to validate.
 2009-10-29 01:37:43 -07:00
Raphael
7d2bb73d20 am b242a1de: am 09c5201a: Prepare version numbers for next SDK & tools 
Merge commit 'b242a1dea689d6d9de6f9d70af2126025e00ddad' into eclair-mr2-plus-aosp

* commit 'b242a1dea689d6d9de6f9d70af2126025e00ddad':
  Prepare version numbers for next SDK & tools
 2009-10-29 01:37:36 -07:00
Raphael
f8c770bbd5 am 107b1a9e: Merge change Ie496edfa into eclair 
Merge commit '107b1a9ee6c8e96027bec7a0caf16f723efd39ce' into eclair-mr2

* commit '107b1a9ee6c8e96027bec7a0caf16f723efd39ce':
  SDK Updater: don't load sdk-repo XML that failed to validate.
 2009-10-29 01:25:39 -07:00
Raphael
b242a1dea6 am 09c5201a: Prepare version numbers for next SDK & tools 
Merge commit '09c5201adca0ceb0e881832d53cfa9e412d07389' into eclair-mr2

* commit '09c5201adca0ceb0e881832d53cfa9e412d07389':
  Prepare version numbers for next SDK & tools
 2009-10-29 01:24:55 -07:00
Mike Reed
d54fed6b92 am 3938c170: am d22a3d97: Revert "update demo to use boundary patch" 
Merge commit '3938c17057d55d375b6088e2cc66223a50c8decf'

* commit '3938c17057d55d375b6088e2cc66223a50c8decf':
  Revert "update demo to use boundary patch"
 2009-10-28 23:56:56 -07:00
Mike Reed
ce9f10f849 am e978740e: am 3f14f59e: update demo to use boundary patch 
Merge commit 'e978740ed3d4afc4bff0c3f626c4c119a1638ab6'

* commit 'e978740ed3d4afc4bff0c3f626c4c119a1638ab6':
  update demo to use boundary patch
 2009-10-28 23:56:44 -07:00
Brett Chabot
8c6c2916c7 am 02a3c591: am 37a59807: am 0c62341e: Merge change I3778cb73 into eclair 
Merge commit '02a3c591af638cccd89eb740e9e33dbc179e59a2'

* commit '02a3c591af638cccd89eb740e9e33dbc179e59a2':
  Fix runcommand logging exception.
 2009-10-28 23:51:16 -07:00
Raphael
9dc744354b am ecccc1eb: am 6fa10fac: am b3bca018: Merge change I337b2644 into eclair 
Merge commit 'ecccc1eb5617d9faccf93ce67c6d446d8106be88'

* commit 'ecccc1eb5617d9faccf93ce67c6d446d8106be88':
  SDK Manager > AVD > Start: print computed scale.
 2009-10-28 23:51:09 -07:00
Xavier Ducrohet
e9979e5a51 am c02e4504: am 1bba62b3: am a73e4f9a: Merge change I7f60270f into eclair 
Merge commit 'c02e450461779ae16708e337ad7f4eb515cfc3e0'

* commit 'c02e450461779ae16708e337ad7f4eb515cfc3e0':
  ADT/GEL: Reenable config popup when switching from a device with only 1 config
 2009-10-28 23:47:59 -07:00
Brett Chabot
43d6951d50 am 48465ba0: am 2aa7a8b8: am 3777f090: Merge change I25e7415f into eclair 
Merge commit '48465ba08923d24ba9a9c2158498112a0d75f925'

* commit '48465ba08923d24ba9a9c2158498112a0d75f925':
  Add runtest --path.
 2009-10-28 23:47:52 -07:00
Mike Reed
3938c17057 am d22a3d97: Revert "update demo to use boundary patch" 
Merge commit 'd22a3d977dc3e999d5ddc9409f7903ae5477ab60' into eclair-mr2-plus-aosp

* commit 'd22a3d977dc3e999d5ddc9409f7903ae5477ab60':
  Revert "update demo to use boundary patch"
 2009-10-28 14:16:28 -07:00
Mike Reed
d22a3d977d Revert "update demo to use boundary patch" 
This reverts commit 3f14f59ee6.
 2009-10-28 17:04:38 -04:00
Mike Reed
e978740ed3 am 3f14f59e: update demo to use boundary patch 
Merge commit '3f14f59ee679c76438f6d37bfc9535b4bc2be024' into eclair-mr2-plus-aosp

* commit '3f14f59ee679c76438f6d37bfc9535b4bc2be024':
  update demo to use boundary patch
 2009-10-28 13:03:28 -07:00
Mike Reed
3f14f59ee6 update demo to use boundary patch 2009-10-28 15:47:54 -04:00
Brett Chabot
02a3c591af am 37a59807: am 0c62341e: Merge change I3778cb73 into eclair 
Merge commit '37a59807b86d330c89904c25dd4540bce8898386' into eclair-mr2-plus-aosp

* commit '37a59807b86d330c89904c25dd4540bce8898386':
  Fix runcommand logging exception.
 2009-10-28 11:52:32 -07:00
Raphael
ecccc1eb56 am 6fa10fac: am b3bca018: Merge change I337b2644 into eclair 
Merge commit '6fa10fac30f79f7a2c59c2c477c757ede18f3aab' into eclair-mr2-plus-aosp

* commit '6fa10fac30f79f7a2c59c2c477c757ede18f3aab':
  SDK Manager > AVD > Start: print computed scale.
 2009-10-28 11:52:27 -07:00
Brett Chabot
37a59807b8 am 0c62341e: Merge change I3778cb73 into eclair 
Merge commit '0c62341e8ec194a18bbf35fb380287c15d2da70d' into eclair-mr2

* commit '0c62341e8ec194a18bbf35fb380287c15d2da70d':
  Fix runcommand logging exception.
 2009-10-28 11:36:51 -07:00
Raphael
6fa10fac30 am b3bca018: Merge change I337b2644 into eclair 
Merge commit 'b3bca018783a0621b981ec8eb98dbbd15f450677' into eclair-mr2

* commit 'b3bca018783a0621b981ec8eb98dbbd15f450677':
  SDK Manager > AVD > Start: print computed scale.
 2009-10-28 11:35:39 -07:00
Xavier Ducrohet
c02e450461 am 1bba62b3: am a73e4f9a: Merge change I7f60270f into eclair 
Merge commit '1bba62b3cba57906bcddd9868e67aa1ef2d150d3' into eclair-mr2-plus-aosp

* commit '1bba62b3cba57906bcddd9868e67aa1ef2d150d3':
  ADT/GEL: Reenable config popup when switching from a device with only 1 config
 2009-10-28 10:41:55 -07:00
Brett Chabot
48465ba089 am 2aa7a8b8: am 3777f090: Merge change I25e7415f into eclair 
Merge commit '2aa7a8b8c7bd76c5c49fc570d88826bec4393524' into eclair-mr2-plus-aosp

* commit '2aa7a8b8c7bd76c5c49fc570d88826bec4393524':
  Add runtest --path.
 2009-10-28 10:41:49 -07:00