Commit Graph

3405 Commits

Author SHA1 Message Date
Raphael
03684b9d88 am 4bf2ce27: 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
2009-11-03 12:17:52 -08:00
Mike Reed
b13e5c3c4e am 9aa2afdf: am 093d9020: Merge change I01b36924 into eclair-mr2
Merge commit '9aa2afdf71702cef8080f862361af4b3fce92137'

* commit '9aa2afdf71702cef8080f862361af4b3fce92137':
  click OK to toggle between demos
2009-11-03 12:04:43 -08:00
Mike Reed
9aa2afdf71 am 093d9020: Merge change I01b36924 into eclair-mr2
Merge commit '093d9020e4569c499d6e0094183fc3a90542404d' into eclair-mr2-plus-aosp

* commit '093d9020e4569c499d6e0094183fc3a90542404d':
  click OK to toggle between demos
2009-11-03 11:54:45 -08:00
Xavier Ducrohet
59342817c6 am 3a8967f6: am 78c9bb59: am f9e0b264: Move check for hidden files in the proper method.
Merge commit '3a8967f62c3d4a0ebeb7a9eeae5d9f273af29448'

* commit '3a8967f62c3d4a0ebeb7a9eeae5d9f273af29448':
  Move check for hidden files in the proper method.
2009-11-03 11:54:27 -08:00
Android (Google) Code Review
093d9020e4 Merge change I01b36924 into eclair-mr2
* changes:
  click OK to toggle between demos
2009-11-03 14:45:53 -05:00
Xavier Ducrohet
3a8967f62c am 78c9bb59: am f9e0b264: Move check for hidden files in the proper method.
Merge commit '78c9bb59eb3cfa92e5a13621b1efe5bd8ecbb92b' into eclair-mr2-plus-aosp

* commit '78c9bb59eb3cfa92e5a13621b1efe5bd8ecbb92b':
  Move check for hidden files in the proper method.
2009-11-03 11:44:40 -08:00
Mike Reed
01b3692429 click OK to toggle between demos 2009-11-03 11:44:25 -08:00
Xavier Ducrohet
867fa469b8 am f9e0b264: Move check for hidden files in the proper method.
Merge commit 'f9e0b264422d086066a9d9deb2118617735e8d65' into eclair-plus-aosp

* commit 'f9e0b264422d086066a9d9deb2118617735e8d65':
  Move check for hidden files in the proper method.
2009-11-03 11:34:50 -08:00
Xavier Ducrohet
78c9bb59eb am f9e0b264: Move check for hidden files in the proper method.
Merge commit 'f9e0b264422d086066a9d9deb2118617735e8d65' into eclair-mr2

* commit 'f9e0b264422d086066a9d9deb2118617735e8d65':
  Move check for hidden files in the proper method.
2009-11-03 11:34:02 -08:00
Xavier Ducrohet
f9e0b26442 Move check for hidden files in the proper method.
Change-Id: I0a364b118d60aaab259cba2b13edcc2c31c39148
2009-11-03 11:23:06 -08:00
Raphael
424e480c9f am f2bf99c3: am a3dce5a0: am 8d700bdf: SDK: fix build. checkFileForPackaging is used by ApkBuilder.
Merge commit 'f2bf99c3874db32474f688051e65def896a809da'

* commit 'f2bf99c3874db32474f688051e65def896a809da':
  SDK: fix build. checkFileForPackaging is used by ApkBuilder.
2009-11-03 10:15:19 -08:00
Raphael
f2bf99c387 am a3dce5a0: am 8d700bdf: SDK: fix build. checkFileForPackaging is used by ApkBuilder.
Merge commit 'a3dce5a089e64ac0e52405ae34560392d360e964' into eclair-mr2-plus-aosp

* commit 'a3dce5a089e64ac0e52405ae34560392d360e964':
  SDK: fix build. checkFileForPackaging is used by ApkBuilder.
2009-11-03 10:02:24 -08:00
Raphael
a3dce5a089 am 8d700bdf: SDK: fix build. checkFileForPackaging is used by ApkBuilder.
Merge commit '8d700bdf67681ad405819c06906325768f8cf9ea' into eclair-mr2

* commit '8d700bdf67681ad405819c06906325768f8cf9ea':
  SDK: fix build. checkFileForPackaging is used by ApkBuilder.
2009-11-03 09:53:32 -08:00
Raphael
2b99959948 am 8d700bdf: SDK: fix build. checkFileForPackaging is used by ApkBuilder.
Merge commit '8d700bdf67681ad405819c06906325768f8cf9ea' into eclair-plus-aosp

* commit '8d700bdf67681ad405819c06906325768f8cf9ea':
  SDK: fix build. checkFileForPackaging is used by ApkBuilder.
2009-11-03 09:53:28 -08:00
Raphael
8d700bdf67 SDK: fix build. checkFileForPackaging is used by ApkBuilder.
Change-Id: I91e9c63adcd6e069b1ec15627b95565c26cd3bc6
Reference: Change If0d0751e
SDK BUG 2233458
2009-11-03 09:40:55 -08:00
Xavier Ducrohet
87714dab8d am 7f98994a: am 35d140af: am f31f6303: Merge change If0d0751e into eclair
Merge commit '7f98994af21d911a2e80e82539524987594c408f'

* commit '7f98994af21d911a2e80e82539524987594c408f':
  Ignore hidden files and vi swap files during packaging.
2009-11-02 23:36:45 -08:00
Xavier Ducrohet
7f98994af2 am 35d140af: am f31f6303: Merge change If0d0751e into eclair
Merge commit '35d140afb413e52f0ed43e30d41050348688f2e2' into eclair-mr2-plus-aosp

* commit '35d140afb413e52f0ed43e30d41050348688f2e2':
  Ignore hidden files and vi swap files during packaging.
2009-11-02 23:26:46 -08:00
Xavier Ducrohet
3a7529554d am f31f6303: Merge change If0d0751e into eclair
Merge commit 'f31f630320a53e067ead2848d24ff63b0e0ad3b0' into eclair-plus-aosp

* commit 'f31f630320a53e067ead2848d24ff63b0e0ad3b0':
  Ignore hidden files and vi swap files during packaging.
2009-11-02 23:17:02 -08:00
Xavier Ducrohet
35d140afb4 am f31f6303: Merge change If0d0751e into eclair
Merge commit 'f31f630320a53e067ead2848d24ff63b0e0ad3b0' into eclair-mr2

* commit 'f31f630320a53e067ead2848d24ff63b0e0ad3b0':
  Ignore hidden files and vi swap files during packaging.
2009-11-02 23:16:41 -08:00
Android (Google) Code Review
f31f630320 Merge change If0d0751e into eclair
* changes:
  Ignore hidden files and vi swap files during packaging.
2009-11-03 02:06:32 -05:00
Xavier Ducrohet
b159651709 Ignore hidden files and vi swap files during packaging.
BUG #2233458

Change-Id: If0d0751ed7b896a7803e9b69fb0e6bff97dd4330
2009-11-02 18:31:46 -08:00
Brett Chabot
52f661be2e am 78ba4a54: (-s ours) am 56af356a: am a9982898: (-s ours) Merge change Ida443c07 into eclair
Merge commit '78ba4a54448b9f68c2a9d810e21d6af8b2c014e0'

* commit '78ba4a54448b9f68c2a9d810e21d6af8b2c014e0':
  Remove calendar provider suite from continuous. DO NOT MERGE
2009-11-02 17:46:28 -08:00
Brett Chabot
78ba4a5444 am 56af356a: am a9982898: (-s ours) Merge change Ida443c07 into eclair
Merge commit '56af356a420bb6329cf309d7ad972f8441fd911c' into eclair-mr2-plus-aosp

* commit '56af356a420bb6329cf309d7ad972f8441fd911c':
  Remove calendar provider suite from continuous. DO NOT MERGE
2009-11-02 17:25:16 -08:00
Brett Chabot
10a96c4205 am a9982898: Merge change Ida443c07 into eclair
Merge commit 'a9982898b33399ddeee1e97f5f0d18c77ec1d538' into eclair-plus-aosp

* commit 'a9982898b33399ddeee1e97f5f0d18c77ec1d538':
  Remove calendar provider suite from continuous. DO NOT MERGE
2009-11-02 17:14:54 -08:00
Brett Chabot
56af356a42 am a9982898: (-s ours) Merge change Ida443c07 into eclair
Merge commit 'a9982898b33399ddeee1e97f5f0d18c77ec1d538' into eclair-mr2

* commit 'a9982898b33399ddeee1e97f5f0d18c77ec1d538':
  Remove calendar provider suite from continuous. DO NOT MERGE
2009-11-02 17:14:46 -08:00
Android (Google) Code Review
a9982898b3 Merge change Ida443c07 into eclair
* changes:
  Remove calendar provider suite from continuous. DO NOT MERGE
2009-11-02 20:08:06 -05:00
Raphael
4bf2ce27a0 SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts
SDK BUG 2232091

Change-Id: I2a000054545b7865769054d1fdc733e50f06edd5
2009-11-02 16:43:32 -08:00
Eric Rowe
6fcfd174c1 am 7ccaafad: am fd2d528e: Merge change I20a74d79 into eclair-mr2
Merge commit '7ccaafad0cc926313d5c158fc99681af2e772626'

* commit '7ccaafad0cc926313d5c158fc99681af2e772626':
  Create way to run monkey with multiple scripts.
2009-11-02 14:51:23 -08:00
Eric Rowe
7ccaafad0c am fd2d528e: Merge change I20a74d79 into eclair-mr2
Merge commit 'fd2d528e36b4a47fc18f4a2e90985a5c17f8ad4f' into eclair-mr2-plus-aosp

* commit 'fd2d528e36b4a47fc18f4a2e90985a5c17f8ad4f':
  Create way to run monkey with multiple scripts.
2009-11-02 14:40:29 -08:00
Android (Google) Code Review
fd2d528e36 Merge change I20a74d79 into eclair-mr2
* changes:
  Create way to run monkey with multiple scripts.
2009-11-02 17:31:49 -05:00
Xavier Ducrohet
35da1ae2c1 am ed52a500: (-s ours) am dd43447b: am 208c7569: (-s ours) am 0dd85d89: (-s ours) Only apply permission to files with +x (do not merge)
Merge commit 'ed52a500e34c3c9debd221986cdc89f1c83ce4d2'

* commit 'ed52a500e34c3c9debd221986cdc89f1c83ce4d2':
  Only apply permission to files with +x (do not merge)
2009-11-02 13:06:54 -08:00
Xavier Ducrohet
ed52a500e3 am dd43447b: am 208c7569: (-s ours) am 0dd85d89: (-s ours) Only apply permission to files with +x (do not merge)
Merge commit 'dd43447bb22ffcbd7b09706b0ca101a7cdfba517' into eclair-mr2-plus-aosp

* commit 'dd43447bb22ffcbd7b09706b0ca101a7cdfba517':
  Only apply permission to files with +x (do not merge)
2009-11-02 12:57:19 -08:00
Xavier Ducrohet
dd43447bb2 am 208c7569: (-s ours) am 0dd85d89: (-s ours) Only apply permission to files with +x (do not merge)
Merge commit '208c75697e483f63f6075f28c1fc4ff49382f884' into eclair-mr2

* commit '208c75697e483f63f6075f28c1fc4ff49382f884':
  Only apply permission to files with +x (do not merge)
2009-11-02 12:45:31 -08:00
Xavier Ducrohet
2e41a5733a am 208c7569: am 0dd85d89: (-s ours) Only apply permission to files with +x (do not merge)
Merge commit '208c75697e483f63f6075f28c1fc4ff49382f884' into eclair-plus-aosp

* commit '208c75697e483f63f6075f28c1fc4ff49382f884':
  Only apply permission to files with +x (do not merge)
2009-11-02 12:45:26 -08:00
Xavier Ducrohet
208c75697e am 0dd85d89: (-s ours) Only apply permission to files with +x (do not merge)
Merge commit '0dd85d89fa90de0d79da296292f75ceb5cf48b92' into eclair

* commit '0dd85d89fa90de0d79da296292f75ceb5cf48b92':
  Only apply permission to files with +x (do not merge)
2009-11-02 12:34:39 -08:00
Xavier Ducrohet
0dd85d89fa Only apply permission to files with +x (do not merge)
integrated from eclair branch.
2009-11-02 12:13:45 -08:00
Xavier Ducrohet
5b5a8bdaf8 am 5d41c599: am 99906d6e: am 192d5db1: Merge change Ied3304a0 into eclair
Merge commit '5d41c599a7ffd408a10468c9dc60456a203386f0'

* commit '5d41c599a7ffd408a10468c9dc60456a203386f0':
  Only apply permission to files with +x
2009-11-02 12:09:39 -08:00
Xavier Ducrohet
5d41c599a7 am 99906d6e: am 192d5db1: Merge change Ied3304a0 into eclair
Merge commit '99906d6e17e85c36ba5e6fff98c66f852af33a9a' into eclair-mr2-plus-aosp

* commit '99906d6e17e85c36ba5e6fff98c66f852af33a9a':
  Only apply permission to files with +x
2009-11-02 11:58:31 -08:00
Xavier Ducrohet
7e668a1f0b am 192d5db1: Merge change Ied3304a0 into eclair
Merge commit '192d5db1fedef99404644256f80740bb3763b049' into eclair-plus-aosp

* commit '192d5db1fedef99404644256f80740bb3763b049':
  Only apply permission to files with +x
2009-11-02 11:48:52 -08:00
Xavier Ducrohet
99906d6e17 am 192d5db1: Merge change Ied3304a0 into eclair
Merge commit '192d5db1fedef99404644256f80740bb3763b049' into eclair-mr2

* commit '192d5db1fedef99404644256f80740bb3763b049':
  Only apply permission to files with +x
2009-11-02 11:48:45 -08:00
Android (Google) Code Review
192d5db1fe Merge change Ied3304a0 into eclair
* changes:
  Only apply permission to files with +x
2009-11-02 14:40:10 -05:00
Raphael
e39d3d284f am 3bb94324: am 62ad060a: am 8a370089: am d3f9eb79: SDK Manager: Display error when saving settings
Merge commit '3bb94324744c04b0bdd7954db0d7800fa2bada84'

* commit '3bb94324744c04b0bdd7954db0d7800fa2bada84':
  SDK Manager: Display error when saving settings
2009-11-01 21:52:56 -08:00
Brett Chabot
4277838e68 Remove calendar provider suite from continuous. DO NOT MERGE
Bug 2171501
2009-10-30 17:49:36 -07:00
Xavier Ducrohet
67ba2de9e7 Only apply permission to files with +x
Change-Id: Ied3304a0f9687b601666c4ec7ce7a34157254d7c
2009-10-30 16:34:47 -07:00
Raphael
3bb9432474 am 62ad060a: am 8a370089: am d3f9eb79: SDK Manager: Display error when saving settings
Merge commit '62ad060a05c3f9d76cdc768e1654d3db3f359280' into eclair-mr2-plus-aosp

* commit '62ad060a05c3f9d76cdc768e1654d3db3f359280':
  SDK Manager: Display error when saving settings
2009-10-30 13:18:14 -07:00
Raphael
73246d4453 am 8a370089: am d3f9eb79: SDK Manager: Display error when saving settings
Merge commit '8a370089b824f5acd97b5986b9b1e5bff3aefca4' into eclair-plus-aosp

* commit '8a370089b824f5acd97b5986b9b1e5bff3aefca4':
  SDK Manager: Display error when saving settings
2009-10-30 13:08:50 -07:00
Raphael
62ad060a05 am 8a370089: am d3f9eb79: SDK Manager: Display error when saving settings
Merge commit '8a370089b824f5acd97b5986b9b1e5bff3aefca4' into eclair-mr2

* commit '8a370089b824f5acd97b5986b9b1e5bff3aefca4':
  SDK Manager: Display error when saving settings
2009-10-30 13:08:23 -07:00
Raphael
8a370089b8 am d3f9eb79: SDK Manager: Display error when saving settings
Merge commit 'd3f9eb79c79752b76e483d5d6774b76bcf91a8de' into eclair

* commit 'd3f9eb79c79752b76e483d5d6774b76bcf91a8de':
  SDK Manager: Display error when saving settings
2009-10-30 13:01:22 -07:00
Raphael
d3f9eb79c7 SDK Manager: Display error when saving settings
SDK BUG 2226029

Change-Id: I568c71b80bddb5c4409df0bd1b02e35b82d6d1ba
2009-10-29 21:28:45 -07:00
Dmitri Plotnikov
371b9a192c am a883d5af: am 7cb020a9: am 41c271bb: Merge change Iae0bc856 into eclair
Merge commit 'a883d5af0639d5f8d4dd9529665e81896221e5be'

* commit 'a883d5af0639d5f8d4dd9529665e81896221e5be':
  A sample application that demonstrates use of legacy and current contacts APIs.
2009-10-29 20:09:27 -07:00