git.osdn.net Git - android-x86/development.git/log

Raphael [Sat, 7 Nov 2009 01:00:35 +0000 (17:00 -0800)]

am d80d98a5: am a4ebc122: am 3de25903: am 8e3442f1: Merge change Ic291d534 into eclair-sdk

Merge commit 'd80d98a5591a68fff9f02b768a08c0e1076aa36c'

* commit 'd80d98a5591a68fff9f02b768a08c0e1076aa36c':
SDK Manager: refresh sources when HTTP/S pref is changed.

commit | commitdiff | tree

Raphael [Sat, 7 Nov 2009 00:51:10 +0000 (16:51 -0800)]

am a4ebc122: am 3de25903: am 8e3442f1: Merge change Ic291d534 into eclair-sdk

Merge commit 'a4ebc12213eafa5297343c6c3e73c7a5acda3fb6' into eclair-mr2-plus-aosp

* commit 'a4ebc12213eafa5297343c6c3e73c7a5acda3fb6':
SDK Manager: refresh sources when HTTP/S pref is changed.

commit | commitdiff | tree

Raphael [Sat, 7 Nov 2009 00:42:10 +0000 (16:42 -0800)]

am 3de25903: am 8e3442f1: Merge change Ic291d534 into eclair-sdk

Merge commit '3de259034c5d028e98d9456775e75d9d12a060c6' into eclair-mr2

* commit '3de259034c5d028e98d9456775e75d9d12a060c6':
SDK Manager: refresh sources when HTTP/S pref is changed.

commit | commitdiff | tree

Raphael [Sat, 7 Nov 2009 00:13:41 +0000 (16:13 -0800)]

am 8e3442f1: Merge change Ic291d534 into eclair-sdk

Merge commit '8e3442f1b0fc19c8213978d4e7ac005774462297' into eclair

* commit '8e3442f1b0fc19c8213978d4e7ac005774462297':
SDK Manager: refresh sources when HTTP/S pref is changed.

commit | commitdiff | tree

Android (Google) Code Review [Sat, 7 Nov 2009 00:06:48 +0000 (19:06 -0500)]

Merge change Ic291d534 into eclair-sdk

* changes:
SDK Manager: refresh sources when HTTP/S pref is changed.

commit | commitdiff | tree

Raphael [Fri, 6 Nov 2009 23:18:57 +0000 (15:18 -0800)]

SDK Manager: refresh sources when HTTP/S pref is changed.

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

commit | commitdiff | tree

Raphael [Fri, 6 Nov 2009 22:29:58 +0000 (14:29 -0800)]

am 86df89cf: am 2d2d3408: am bf9a70fb: am ca4603db: SDK: fix NPE in AVD Manager > Start when skin.path is missing.

Merge commit '86df89cf62b4f4f274858b840fa97a50c1a9d50c'

* commit '86df89cf62b4f4f274858b840fa97a50c1a9d50c':
SDK: fix NPE in AVD Manager > Start when skin.path is missing.

commit | commitdiff | tree

Raphael [Fri, 6 Nov 2009 22:18:37 +0000 (14:18 -0800)]

am 2d2d3408: am bf9a70fb: am ca4603db: SDK: fix NPE in AVD Manager > Start when skin.path is missing.

Merge commit '2d2d34086516a36e8d26f927c75b9944fd07b69f' into eclair-mr2-plus-aosp

* commit '2d2d34086516a36e8d26f927c75b9944fd07b69f':
SDK: fix NPE in AVD Manager > Start when skin.path is missing.

commit | commitdiff | tree

Raphael [Fri, 6 Nov 2009 22:08:28 +0000 (14:08 -0800)]

am bf9a70fb: am ca4603db: SDK: fix NPE in AVD Manager > Start when skin.path is missing.

Merge commit 'bf9a70fb1beb15944cb47d267c7b15ab699dca63' into eclair-mr2

* commit 'bf9a70fb1beb15944cb47d267c7b15ab699dca63':
SDK: fix NPE in AVD Manager > Start when skin.path is missing.

commit | commitdiff | tree

Raphael [Fri, 6 Nov 2009 22:00:55 +0000 (14:00 -0800)]

am ca4603db: 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.

commit | commitdiff | tree

Raphael [Fri, 6 Nov 2009 21:42:28 +0000 (13:42 -0800)]

SDK: fix NPE in AVD Manager > Start when skin.path is missing.

Change-Id: I0e42d3f110cfc4e313972f3021b7d2d84dfbd64d

commit | commitdiff | tree

Xavier Ducrohet [Fri, 6 Nov 2009 19:34:55 +0000 (11:34 -0800)]

am 01262b3a: am f0f501ec: am 396a10e4: Merge change I793a35a9 into eclair

Merge commit '01262b3ae709cbe1f141ab8976e4926510fd429d'

* commit '01262b3ae709cbe1f141ab8976e4926510fd429d':
ADT now launches app as if launched from launcher.

commit | commitdiff | tree

Xavier Ducrohet [Fri, 6 Nov 2009 19:24:31 +0000 (11:24 -0800)]

am f0f501ec: am 396a10e4: Merge change I793a35a9 into eclair

Merge commit 'f0f501ec27a4b37bf06288de808bc083d251921a' into eclair-mr2-plus-aosp

* commit 'f0f501ec27a4b37bf06288de808bc083d251921a':
ADT now launches app as if launched from launcher.

commit | commitdiff | tree

Xavier Ducrohet [Fri, 6 Nov 2009 19:15:38 +0000 (11:15 -0800)]

am 396a10e4: Merge change I793a35a9 into eclair

Merge commit '396a10e48d7201215e54821fa0d7901ffde3a30a' into eclair-mr2

* commit '396a10e48d7201215e54821fa0d7901ffde3a30a':
ADT now launches app as if launched from launcher.

commit | commitdiff | tree

Android (Google) Code Review [Fri, 6 Nov 2009 19:08:24 +0000 (14:08 -0500)]

Merge change I793a35a9 into eclair

* changes:
ADT now launches app as if launched from launcher.

commit | commitdiff | tree

Xavier Ducrohet [Fri, 6 Nov 2009 02:38:04 +0000 (18:38 -0800)]

ADT now launches app as if launched from launcher.

BUG 2243142

Change-Id: I793a35a92cf0f818242e74e4794d74a681b25d83

commit | commitdiff | tree

Xavier Ducrohet [Fri, 6 Nov 2009 18:46:46 +0000 (10:46 -0800)]

am 886119f5: am e9373a42: am 7853d243: Merge change I1fa1ae88 into eclair

Merge commit '886119f56de90a5569915be9782de4b69460930a'

* commit '886119f56de90a5569915be9782de4b69460930a':
Move Tools to rev 5, and ADT to 0.9.5

commit | commitdiff | tree

Xavier Ducrohet [Fri, 6 Nov 2009 18:36:18 +0000 (10:36 -0800)]

am e9373a42: am 7853d243: Merge change I1fa1ae88 into eclair

Merge commit 'e9373a42114a9ed37dbdc68991250bd40f54552f' into eclair-mr2-plus-aosp

* commit 'e9373a42114a9ed37dbdc68991250bd40f54552f':
Move Tools to rev 5, and ADT to 0.9.5

commit | commitdiff | tree

Xavier Ducrohet [Fri, 6 Nov 2009 18:26:37 +0000 (10:26 -0800)]

am 7853d243: Merge change I1fa1ae88 into eclair

Merge commit '7853d243aa0f2947249aa610972d74622cdddd82' into eclair-mr2

* commit '7853d243aa0f2947249aa610972d74622cdddd82':
Move Tools to rev 5, and ADT to 0.9.5

commit | commitdiff | tree

Android (Google) Code Review [Fri, 6 Nov 2009 18:15:45 +0000 (13:15 -0500)]

Merge change I1fa1ae88 into eclair

* changes:
Move Tools to rev 5, and ADT to 0.9.5

commit | commitdiff | tree

Xavier Ducrohet [Fri, 6 Nov 2009 18:05:53 +0000 (10:05 -0800)]

Move Tools to rev 5, and ADT to 0.9.5

Change-Id: I1fa1ae883eea4d27d5718788594ab0cb52ca6445

commit | commitdiff | tree

Fred Quintana [Thu, 5 Nov 2009 22:11:53 +0000 (14:11 -0800)]

am ae8ea92c: am a04b9614: am b5723869: Merge change I85aa2b1d into eclair

Merge commit 'ae8ea92c1111e993e4fb5eb115ff6d2c5c21d214'

* commit 'ae8ea92c1111e993e4fb5eb115ff6d2c5c21d214':
create a test app that allows direct control of a sync adapter for testing purposes

commit | commitdiff | tree

mike ritter [Thu, 5 Nov 2009 22:11:46 +0000 (14:11 -0800)]

am 3fb2d576: am c0446aa9: Merge change I4d2a57bc into eclair-mr2

Merge commit '3fb2d576e9f386ecaa6a2637131c8fac89d05276'

* commit '3fb2d576e9f386ecaa6a2637131c8fac89d05276':
Moved values into attributes of xml elements where they belong

commit | commitdiff | tree

Fred Quintana [Thu, 5 Nov 2009 21:58:54 +0000 (13:58 -0800)]

am a04b9614: am b5723869: Merge change I85aa2b1d into eclair

Merge commit 'a04b9614ce35fe22e99c0bb765084a0d8e3af3f1' into eclair-mr2-plus-aosp

* commit 'a04b9614ce35fe22e99c0bb765084a0d8e3af3f1':
create a test app that allows direct control of a sync adapter for testing purposes

commit | commitdiff | tree

mike ritter [Thu, 5 Nov 2009 21:58:42 +0000 (13:58 -0800)]

am c0446aa9: Merge change I4d2a57bc into eclair-mr2

Merge commit 'c0446aa9d2b6610dd3d92611c0c0867e960198d9' into eclair-mr2-plus-aosp

* commit 'c0446aa9d2b6610dd3d92611c0c0867e960198d9':
Moved values into attributes of xml elements where they belong

commit | commitdiff | tree

Fred Quintana [Thu, 5 Nov 2009 21:53:36 +0000 (13:53 -0800)]

am b5723869: Merge change I85aa2b1d into eclair

Merge commit 'b57238690e7e4afa66416e3ad25183a576f35075' into eclair-mr2

* commit 'b57238690e7e4afa66416e3ad25183a576f35075':
create a test app that allows direct control of a sync adapter for testing purposes

commit | commitdiff | tree

Android (Google) Code Review [Thu, 5 Nov 2009 21:50:10 +0000 (16:50 -0500)]

Merge change I4d2a57bc into eclair-mr2

* changes:
Moved values into attributes of xml elements where they belong

commit | commitdiff | tree

Android (Google) Code Review [Thu, 5 Nov 2009 19:16:08 +0000 (14:16 -0500)]

Merge change I85aa2b1d into eclair

* changes:
create a test app that allows direct control of a sync adapter for testing purposes

commit | commitdiff | tree

Fred Quintana [Wed, 4 Nov 2009 01:18:33 +0000 (17:18 -0800)]

create a test app that allows direct control of a sync adapter for testing purposes

http://b/issue?id=2239791

commit | commitdiff | tree

Xavier Ducrohet [Wed, 4 Nov 2009 23:35:49 +0000 (15:35 -0800)]

am 019eca1a: (-s ours) am 4e97e5da: am 421e8d33: (-s ours) am 7f305ce7: (-s ours) Ignore hidden files and vi swap files during packaging. (do not merge)

Merge commit '019eca1a7920da9cf5dc7efebb7d24b86561a989'

* commit '019eca1a7920da9cf5dc7efebb7d24b86561a989':
Ignore hidden files and vi swap files during packaging. (do not merge)

commit | commitdiff | tree

Xavier Ducrohet [Wed, 4 Nov 2009 23:25:12 +0000 (15:25 -0800)]

am 4e97e5da: am 421e8d33: (-s ours) am 7f305ce7: (-s ours) Ignore hidden files and vi swap files during packaging. (do not merge)

Merge commit '4e97e5da372f1be39e9eeccc9cad7a551c164828' into eclair-mr2-plus-aosp

* commit '4e97e5da372f1be39e9eeccc9cad7a551c164828':
Ignore hidden files and vi swap files during packaging. (do not merge)

commit | commitdiff | tree

Xavier Ducrohet [Wed, 4 Nov 2009 23:15:19 +0000 (15:15 -0800)]

am 421e8d33: (-s ours) am 7f305ce7: (-s ours) Ignore hidden files and vi swap files during packaging. (do not merge)

Merge commit '421e8d3353de606444e5350d8feeee8c01c90394' into eclair-mr2

* commit '421e8d3353de606444e5350d8feeee8c01c90394':
Ignore hidden files and vi swap files during packaging. (do not merge)

commit | commitdiff | tree

Xavier Ducrohet [Wed, 4 Nov 2009 23:05:34 +0000 (15:05 -0800)]

am 7f305ce7: (-s ours) Ignore hidden files and vi swap files during packaging. (do not merge)

Merge commit '7f305ce77069cf8432374f12392a3ce3a476bdce' into eclair

* commit '7f305ce77069cf8432374f12392a3ce3a476bdce':
Ignore hidden files and vi swap files during packaging. (do not merge)

commit | commitdiff | tree

Xavier Ducrohet [Tue, 3 Nov 2009 02:31:46 +0000 (18:31 -0800)]

Ignore hidden files and vi swap files during packaging. (do not merge)

BUG #2233458

This is integrated from eclair.

commit | commitdiff | tree

Eric Rowe [Wed, 4 Nov 2009 02:53:03 +0000 (18:53 -0800)]

am a6d49e3a: am 80de9538: Fix bug where monkey always tries to run multiple scripts.

Merge commit 'a6d49e3a2ea9b6b4f4cb01c32fc910ea070db45e'

* commit 'a6d49e3a2ea9b6b4f4cb01c32fc910ea070db45e':
Fix bug where monkey always tries to run multiple scripts.

commit | commitdiff | tree

Eric Rowe [Wed, 4 Nov 2009 02:42:55 +0000 (18:42 -0800)]

am 80de9538: Fix bug where monkey always tries to run multiple scripts.

Merge commit '80de953874fd16dae6c89a2949e2fd5a14c1303f' into eclair-mr2-plus-aosp

* commit '80de953874fd16dae6c89a2949e2fd5a14c1303f':
Fix bug where monkey always tries to run multiple scripts.

commit | commitdiff | tree

Eric Rowe [Wed, 4 Nov 2009 02:24:47 +0000 (18:24 -0800)]

Fix bug where monkey always tries to run multiple scripts.

Change condition so MonkeySourceRandromScript is only triggered on multiple
scripts.

commit | commitdiff | tree

Raphael [Tue, 3 Nov 2009 20:46:16 +0000 (12:46 -0800)]

am 3d18353b: am 0136501f: am 03684b9d: am 4bf2ce27: SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts

Merge commit '3d18353bacbce63c87905a6d6e35806d70ecb556'

* commit '3d18353bacbce63c87905a6d6e35806d70ecb556':
SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts

commit | commitdiff | tree

Raphael [Tue, 3 Nov 2009 20:35:39 +0000 (12:35 -0800)]

am 0136501f: am 03684b9d: am 4bf2ce27: SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts

Merge commit '0136501f88c2e5181d9bf60c5d71fdc4696361c0' into eclair-mr2-plus-aosp

* commit '0136501f88c2e5181d9bf60c5d71fdc4696361c0':
SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts

commit | commitdiff | tree

Raphael [Tue, 3 Nov 2009 20:25:07 +0000 (12:25 -0800)]

am 03684b9d: am 4bf2ce27: SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts

Merge commit '03684b9d88cfa8f9775685d7a4efed2c96a57932' into eclair-mr2

* commit '03684b9d88cfa8f9775685d7a4efed2c96a57932':
SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts

commit | commitdiff | tree

Raphael [Tue, 3 Nov 2009 20:17:52 +0000 (12:17 -0800)]

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

commit | commitdiff | tree

Mike Reed [Tue, 3 Nov 2009 20:04:43 +0000 (12:04 -0800)]

am 9aa2afdf: am 093d9020: Merge change I01b36924 into eclair-mr2

Merge commit '9aa2afdf71702cef8080f862361af4b3fce92137'

* commit '9aa2afdf71702cef8080f862361af4b3fce92137':
click OK to toggle between demos

commit | commitdiff | tree

Mike Reed [Tue, 3 Nov 2009 19:54:45 +0000 (11:54 -0800)]

am 093d9020: Merge change I01b36924 into eclair-mr2

Merge commit '093d9020e4569c499d6e0094183fc3a90542404d' into eclair-mr2-plus-aosp

* commit '093d9020e4569c499d6e0094183fc3a90542404d':
click OK to toggle between demos

commit | commitdiff | tree

Xavier Ducrohet [Tue, 3 Nov 2009 19:54:27 +0000 (11:54 -0800)]

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.

commit | commitdiff | tree

Android (Google) Code Review [Tue, 3 Nov 2009 19:45:53 +0000 (14:45 -0500)]

Merge change I01b36924 into eclair-mr2

* changes:
click OK to toggle between demos

commit | commitdiff | tree

Xavier Ducrohet [Tue, 3 Nov 2009 19:44:40 +0000 (11:44 -0800)]

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.

commit | commitdiff | tree

Mike Reed [Tue, 3 Nov 2009 19:44:25 +0000 (11:44 -0800)]

click OK to toggle between demos

commit | commitdiff | tree

Xavier Ducrohet [Tue, 3 Nov 2009 19:34:02 +0000 (11:34 -0800)]

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.

commit | commitdiff | tree

Xavier Ducrohet [Tue, 3 Nov 2009 18:52:54 +0000 (10:52 -0800)]

Move check for hidden files in the proper method.

Change-Id: I0a364b118d60aaab259cba2b13edcc2c31c39148

commit | commitdiff | tree

Raphael [Tue, 3 Nov 2009 18:15:19 +0000 (10:15 -0800)]

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.

commit | commitdiff | tree

Raphael [Tue, 3 Nov 2009 18:02:24 +0000 (10:02 -0800)]

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.

commit | commitdiff | tree

Raphael [Tue, 3 Nov 2009 17:53:32 +0000 (09:53 -0800)]

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.

commit | commitdiff | tree

Raphael [Tue, 3 Nov 2009 17:40:55 +0000 (09:40 -0800)]

SDK: fix build. checkFileForPackaging is used by ApkBuilder.

Change-Id: I91e9c63adcd6e069b1ec15627b95565c26cd3bc6
Reference: Change If0d0751e
SDK BUG 2233458

commit | commitdiff | tree

Xavier Ducrohet [Tue, 3 Nov 2009 07:36:45 +0000 (23:36 -0800)]

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.

commit | commitdiff | tree

Xavier Ducrohet [Tue, 3 Nov 2009 07:26:46 +0000 (23:26 -0800)]

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.

commit | commitdiff | tree

Xavier Ducrohet [Tue, 3 Nov 2009 07:16:41 +0000 (23:16 -0800)]

am f31f6303: Merge change If0d0751e into eclair

Merge commit 'f31f630320a53e067ead2848d24ff63b0e0ad3b0' into eclair-mr2

* commit 'f31f630320a53e067ead2848d24ff63b0e0ad3b0':
Ignore hidden files and vi swap files during packaging.

commit | commitdiff | tree

Android (Google) Code Review [Tue, 3 Nov 2009 07:06:32 +0000 (02:06 -0500)]

Merge change If0d0751e into eclair

* changes:
Ignore hidden files and vi swap files during packaging.

commit | commitdiff | tree

Xavier Ducrohet [Tue, 3 Nov 2009 02:31:46 +0000 (18:31 -0800)]

Ignore hidden files and vi swap files during packaging.

BUG #2233458

Change-Id: If0d0751ed7b896a7803e9b69fb0e6bff97dd4330

commit | commitdiff | tree

Brett Chabot [Tue, 3 Nov 2009 01:46:28 +0000 (17:46 -0800)]

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

commit | commitdiff | tree

Brett Chabot [Tue, 3 Nov 2009 01:25:16 +0000 (17:25 -0800)]

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

commit | commitdiff | tree

Brett Chabot [Tue, 3 Nov 2009 01:14:46 +0000 (17:14 -0800)]

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

commit | commitdiff | tree

Android (Google) Code Review [Tue, 3 Nov 2009 01:08:06 +0000 (20:08 -0500)]

Merge change Ida443c07 into eclair

* changes:
Remove calendar provider suite from continuous. DO NOT MERGE

commit | commitdiff | tree

Raphael [Mon, 2 Nov 2009 22:54:29 +0000 (14:54 -0800)]

SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts

SDK BUG 2232091

Change-Id: I2a000054545b7865769054d1fdc733e50f06edd5

commit | commitdiff | tree

Eric Rowe [Mon, 2 Nov 2009 22:51:23 +0000 (14:51 -0800)]

am 7ccaafad: am fd2d528e: Merge change I20a74d79 into eclair-mr2

Merge commit '7ccaafad0cc926313d5c158fc99681af2e772626'

* commit '7ccaafad0cc926313d5c158fc99681af2e772626':
Create way to run monkey with multiple scripts.

commit | commitdiff | tree

Eric Rowe [Mon, 2 Nov 2009 22:40:29 +0000 (14:40 -0800)]

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.

commit | commitdiff | tree

Android (Google) Code Review [Mon, 2 Nov 2009 22:31:49 +0000 (17:31 -0500)]

Merge change I20a74d79 into eclair-mr2

* changes:
Create way to run monkey with multiple scripts.

commit | commitdiff | tree

Xavier Ducrohet [Mon, 2 Nov 2009 21:06:54 +0000 (13:06 -0800)]

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)

commit | commitdiff | tree

Xavier Ducrohet [Mon, 2 Nov 2009 20:57:19 +0000 (12:57 -0800)]

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)

commit | commitdiff | tree

Xavier Ducrohet [Mon, 2 Nov 2009 20:45:31 +0000 (12:45 -0800)]

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)

commit | commitdiff | tree

Xavier Ducrohet [Mon, 2 Nov 2009 20:34:39 +0000 (12:34 -0800)]

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)

commit | commitdiff | tree

Xavier Ducrohet [Fri, 30 Oct 2009 23:34:47 +0000 (16:34 -0700)]

Only apply permission to files with +x (do not merge)

integrated from eclair branch.

commit | commitdiff | tree

Xavier Ducrohet [Mon, 2 Nov 2009 20:09:39 +0000 (12:09 -0800)]

am 5d41c599: am 99906d6e: am 192d5db1: Merge change Ied3304a0 into eclair

Merge commit '5d41c599a7ffd408a10468c9dc60456a203386f0'

* commit '5d41c599a7ffd408a10468c9dc60456a203386f0':
Only apply permission to files with +x

commit | commitdiff | tree

Xavier Ducrohet [Mon, 2 Nov 2009 19:58:31 +0000 (11:58 -0800)]

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

commit | commitdiff | tree

Xavier Ducrohet [Mon, 2 Nov 2009 19:48:45 +0000 (11:48 -0800)]

am 192d5db1: Merge change Ied3304a0 into eclair

Merge commit '192d5db1fedef99404644256f80740bb3763b049' into eclair-mr2

* commit '192d5db1fedef99404644256f80740bb3763b049':
Only apply permission to files with +x

commit | commitdiff | tree

Android (Google) Code Review [Mon, 2 Nov 2009 19:40:10 +0000 (14:40 -0500)]

Merge change Ied3304a0 into eclair

* changes:
Only apply permission to files with +x

commit | commitdiff | tree

Raphael [Mon, 2 Nov 2009 05:52:56 +0000 (21:52 -0800)]

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

commit | commitdiff | tree

Brett Chabot [Sat, 31 Oct 2009 00:20:49 +0000 (17:20 -0700)]

Remove calendar provider suite from continuous. DO NOT MERGE

Bug 2171501

commit | commitdiff | tree

Xavier Ducrohet [Fri, 30 Oct 2009 23:34:47 +0000 (16:34 -0700)]

Only apply permission to files with +x

Change-Id: Ied3304a0f9687b601666c4ec7ce7a34157254d7c

commit | commitdiff | tree

Raphael [Fri, 30 Oct 2009 20:18:14 +0000 (13:18 -0700)]

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

commit | commitdiff | tree

Raphael [Fri, 30 Oct 2009 20:08:23 +0000 (13:08 -0700)]

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

commit | commitdiff | tree

Raphael [Fri, 30 Oct 2009 20:01:22 +0000 (13:01 -0700)]

am d3f9eb79: SDK Manager: Display error when saving settings

Merge commit 'd3f9eb79c79752b76e483d5d6774b76bcf91a8de' into eclair

* commit 'd3f9eb79c79752b76e483d5d6774b76bcf91a8de':
SDK Manager: Display error when saving settings

commit | commitdiff | tree

Raphael [Fri, 30 Oct 2009 04:20:41 +0000 (21:20 -0700)]

SDK Manager: Display error when saving settings

SDK BUG 2226029

Change-Id: I568c71b80bddb5c4409df0bd1b02e35b82d6d1ba

commit | commitdiff | tree

Dmitri Plotnikov [Fri, 30 Oct 2009 03:09:27 +0000 (20:09 -0700)]

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.

commit | commitdiff | tree

Raphael [Fri, 30 Oct 2009 03:09:21 +0000 (20:09 -0700)]

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.

commit | commitdiff | tree

Brett Chabot [Fri, 30 Oct 2009 03:09:15 +0000 (20:09 -0700)]

am f09e872d: am 4ab62412: am da78534e: Merge change Ia94518e3 into eclair

Merge commit 'f09e872d7d1a72bd67a62707fea5a2239d83c6b1'

* commit 'f09e872d7d1a72bd67a62707fea5a2239d83c6b1':
ADT test fixes.

commit | commitdiff | tree

Raphael [Fri, 30 Oct 2009 03:09:08 +0000 (20:09 -0700)]

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.

commit | commitdiff | tree

Raphael [Fri, 30 Oct 2009 03:08:56 +0000 (20:08 -0700)]

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.

commit | commitdiff | tree

Xavier Ducrohet [Fri, 30 Oct 2009 03:08:49 +0000 (20:08 -0700)]

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

commit | commitdiff | tree

Xavier Ducrohet [Fri, 30 Oct 2009 03:08:41 +0000 (20:08 -0700)]

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

commit | commitdiff | tree

Mike Reed [Fri, 30 Oct 2009 03:08:31 +0000 (20:08 -0700)]

am 16f13724: am 8d0b3af5: Merge change Ia8fe3f64 into eclair-mr2

Merge commit '16f13724adda3fbc382447937a2a3d65b7678e2e'

* commit '16f13724adda3fbc382447937a2a3d65b7678e2e':
add graphicslab test app

commit | commitdiff | tree

Dmitri Plotnikov [Fri, 30 Oct 2009 02:52:34 +0000 (19:52 -0700)]

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.

commit | commitdiff | tree

Raphael [Fri, 30 Oct 2009 02:52:28 +0000 (19:52 -0700)]

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.

commit | commitdiff | tree

Brett Chabot [Fri, 30 Oct 2009 02:52:15 +0000 (19:52 -0700)]

am 4ab62412: am da78534e: Merge change Ia94518e3 into eclair

Merge commit '4ab624121684ae57461ab85828eecc6de05cf64b' into eclair-mr2-plus-aosp

* commit '4ab624121684ae57461ab85828eecc6de05cf64b':
ADT test fixes.

commit | commitdiff | tree

Raphael [Fri, 30 Oct 2009 02:52:09 +0000 (19:52 -0700)]

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.

commit | commitdiff | tree

Raphael [Fri, 30 Oct 2009 02:52:01 +0000 (19:52 -0700)]

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.

commit | commitdiff | tree

Xavier Ducrohet [Fri, 30 Oct 2009 02:51:54 +0000 (19:51 -0700)]

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

commit | commitdiff | tree

Xavier Ducrohet [Fri, 30 Oct 2009 02:51:46 +0000 (19:51 -0700)]

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

commit | commitdiff | tree

Mike Reed [Fri, 30 Oct 2009 02:51:36 +0000 (19:51 -0700)]

am 8d0b3af5: Merge change Ia8fe3f64 into eclair-mr2

Merge commit '8d0b3af557553992d8a4f1eab6567c6535544f92' into eclair-mr2-plus-aosp

* commit '8d0b3af557553992d8a4f1eab6567c6535544f92':
add graphicslab test app

commit | commitdiff | tree

Dmitri Plotnikov [Fri, 30 Oct 2009 02:32:52 +0000 (19:32 -0700)]

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.

commit | commitdiff | tree

Raphael [Fri, 30 Oct 2009 02:32:40 +0000 (19:32 -0700)]

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.