OSDN Git Service
Raphael [Tue, 10 Nov 2009 00:23:29 +0000 (16:23 -0800)]
am
a7f3e75e: am
2d03b2a5: am
8ccddf4c: Merge change Id49751eb into eclair-sdk
Merge commit '
a7f3e75ebb849bff947d12b3be24145c4cb9de9a' into eclair-mr2-plus-aosp
* commit '
a7f3e75ebb849bff947d12b3be24145c4cb9de9a':
SDK Manager: reuse complete downloads, retry Windows locks.
Raphael [Tue, 10 Nov 2009 00:17:21 +0000 (16:17 -0800)]
am
2d03b2a5: am
8ccddf4c: Merge change Id49751eb into eclair-sdk
Merge commit '
2d03b2a5d172e7f9a3fd8e50e27b9c5a3a87b96e' into eclair-mr2
* commit '
2d03b2a5d172e7f9a3fd8e50e27b9c5a3a87b96e':
SDK Manager: reuse complete downloads, retry Windows locks.
Derek Sollenberger [Mon, 9 Nov 2009 20:47:14 +0000 (12:47 -0800)]
am
606fe528: Merge change Ib4a23918 into eclair-mr2
Merge commit '
606fe5281d830a6f4eb7ba36bf7127eb3b8cd934' into eclair-mr2-plus-aosp
* commit '
606fe5281d830a6f4eb7ba36bf7127eb3b8cd934':
Updating sample plugin to test java class loading.
Android (Google) Code Review [Mon, 9 Nov 2009 20:43:03 +0000 (12:43 -0800)]
Merge change Ib4a23918 into eclair-mr2
* changes:
Updating sample plugin to test java class loading.
Derek Sollenberger [Mon, 9 Nov 2009 20:38:58 +0000 (15:38 -0500)]
Updating sample plugin to test java class loading.
Bjorn Bringert [Mon, 9 Nov 2009 20:14:29 +0000 (12:14 -0800)]
am
e8b11328: am
f702fa41: Merge change I53c8228b into eclair
Merge commit '
e8b11328e22d4e187e195753f1aacb59c5e30179' into eclair-mr2-plus-aosp
* commit '
e8b11328e22d4e187e195753f1aacb59c5e30179':
Fix type of _id col in SearchableDictionary
Xavier Ducrohet [Mon, 9 Nov 2009 20:14:25 +0000 (12:14 -0800)]
am
811d2c75: am
7e56f226: Merge change I68a71c11 into eclair
Merge commit '
811d2c7507b03f04391c7b21e0de795c6ad12f5d' into eclair-mr2-plus-aosp
* commit '
811d2c7507b03f04391c7b21e0de795c6ad12f5d':
Add Japanese font to SDK.
Brett Chabot [Mon, 9 Nov 2009 20:14:20 +0000 (12:14 -0800)]
am
851c913b: am
f765a70a: Update adt-tests build.properties to include new test data location.
Merge commit '
851c913b6e3cdf7cb334d4b24ae3e1079554203b' into eclair-mr2-plus-aosp
* commit '
851c913b6e3cdf7cb334d4b24ae3e1079554203b':
Update adt-tests build.properties to include new test data location.
Raphael [Mon, 9 Nov 2009 19:59:37 +0000 (11:59 -0800)]
am
8ccddf4c: Merge change Id49751eb into eclair-sdk
Merge commit '
8ccddf4c00464c6fee998d56da1f08b4662abf62' into eclair
* commit '
8ccddf4c00464c6fee998d56da1f08b4662abf62':
SDK Manager: reuse complete downloads, retry Windows locks.
Bjorn Bringert [Mon, 9 Nov 2009 19:57:37 +0000 (11:57 -0800)]
am
f702fa41: Merge change I53c8228b into eclair
Merge commit '
f702fa413273d175ba499bcb9bd352d208621d95' into eclair-mr2
* commit '
f702fa413273d175ba499bcb9bd352d208621d95':
Fix type of _id col in SearchableDictionary
Xavier Ducrohet [Mon, 9 Nov 2009 19:57:33 +0000 (11:57 -0800)]
am
7e56f226: Merge change I68a71c11 into eclair
Merge commit '
7e56f226f745c2397b2cec4d0da1f61276e1b150' into eclair-mr2
* commit '
7e56f226f745c2397b2cec4d0da1f61276e1b150':
Add Japanese font to SDK.
Brett Chabot [Mon, 9 Nov 2009 19:57:18 +0000 (11:57 -0800)]
am
f765a70a: Update adt-tests build.properties to include new test data location.
Merge commit '
f765a70ac7dd8aabbaca696af5860c2bffdf8df0' into eclair-mr2
* commit '
f765a70ac7dd8aabbaca696af5860c2bffdf8df0':
Update adt-tests build.properties to include new test data location.
Android (Google) Code Review [Mon, 9 Nov 2009 16:58:40 +0000 (08:58 -0800)]
Merge change I53c8228b into eclair
* changes:
Fix type of _id col in SearchableDictionary
Jean-Baptiste Queru [Mon, 9 Nov 2009 16:04:49 +0000 (08:04 -0800)]
merge from open-source master
Android (Google) Code Review [Mon, 9 Nov 2009 01:02:05 +0000 (17:02 -0800)]
Merge change I68a71c11 into eclair
* changes:
Add Japanese font to SDK.
Xavier Ducrohet [Sun, 8 Nov 2009 23:15:37 +0000 (15:15 -0800)]
Add Japanese font to SDK.
BUG
2041229
Change-Id: I68a71c11ae4f61c987a888dadf205f585b577c61
Brett Chabot [Sun, 8 Nov 2009 21:46:35 +0000 (13:46 -0800)]
Update adt-tests build.properties to include new test data location.
Missed this file in the 31885 commit.
Android (Google) Code Review [Sun, 8 Nov 2009 21:34:15 +0000 (13:34 -0800)]
Merge change Id49751eb into eclair-sdk
* changes:
SDK Manager: reuse complete downloads, retry Windows locks.
Brett Chabot [Sat, 7 Nov 2009 20:59:10 +0000 (12:59 -0800)]
am
e458201d: am
534b520e: Merge change If5b2f9df into eclair
Merge commit '
e458201d1ab45d9b72027d3d319d16810bf0b94f' into eclair-mr2-plus-aosp
* commit '
e458201d1ab45d9b72027d3d319d16810bf0b94f':
Fix ADT test data references.
Brett Chabot [Sat, 7 Nov 2009 20:49:46 +0000 (12:49 -0800)]
am
534b520e: Merge change If5b2f9df into eclair
Merge commit '
534b520e4add964f75cf6a8a612b54916d46da2e' into eclair-mr2
* commit '
534b520e4add964f75cf6a8a612b54916d46da2e':
Fix ADT test data references.
Android (Google) Code Review [Sat, 7 Nov 2009 20:40:26 +0000 (15:40 -0500)]
Merge change If5b2f9df into eclair
* changes:
Fix ADT test data references.
Raphael [Sat, 7 Nov 2009 02:55:04 +0000 (18:55 -0800)]
SDK Manager: reuse complete downloads, retry Windows locks.
This resolves 2 main issues with the SDK updater:
- Completed downloads are not cleared till the install is successful
- They are also stored in SDK/temp rather than the real Windows TEMP
folder, making them more discoverable for savvy users.
- There's a retry loop on failed install when due to a directory
being locked.
- The retry loop comes with the a Big Fat Warning[tm] in a modal
dialog box. You can't miss it. And it explicitly mentions the
antivirus software can be the root cause.
SDK BUG
2235058
Change-Id: Id49751ebd67e7291a0e7005136b22576335729c1
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.
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.
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.
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.
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
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.
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.
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.
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
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.
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.
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.
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
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
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
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
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
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
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
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
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
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
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
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)
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)
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)
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.
Bjorn Bringert [Tue, 3 Nov 2009 15:37:36 +0000 (15:37 +0000)]
Fix type of _id col in SearchableDictionary
SDK SAMPLE CODE ONLY
Before, the _id column in the search suggestions contained
a string. This causes an exception when the suggestion provider
is used for in-app search in Cupcake. Now the _id column contains
a long instead.
Fixes http://b/issue?id=
2219970
Change-Id: I53c8228badbb0e3ff1799107490b44ff8ced7148
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.
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.
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
Brett Chabot [Tue, 3 Nov 2009 20:29:42 +0000 (12:29 -0800)]
Fix ADT test data references.
- Remove reference to ADT from sdklib tests.
- Move ADT test data to be closer to their test classes, and to make it obvious
this data is only for ADT unit tests.
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
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
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
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
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.
Mike Reed [Tue, 3 Nov 2009 19:44:25 +0000 (11:44 -0800)]
click OK to toggle between demos
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.
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
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.
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.
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
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.
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.
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.
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
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
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
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
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
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.
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.
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)
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)
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)
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.
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
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
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
Brett Chabot [Sat, 31 Oct 2009 00:20:49 +0000 (17:20 -0700)]
Remove calendar provider suite from continuous. DO NOT MERGE
Bug
2171501
Xavier Ducrohet [Fri, 30 Oct 2009 23:34:47 +0000 (16:34 -0700)]
Only apply permission to files with +x
Change-Id: Ied3304a0f9687b601666c4ec7ce7a34157254d7c
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
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
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
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
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.
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.
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.
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.
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.
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
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
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
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.
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.
Brett Chabot [Fri, 30 Oct 2009 02:32:34 +0000 (19:32 -0700)]
am
da78534e: Merge change Ia94518e3 into eclair
Merge commit '
da78534e3aefa41c7b76f6570cfcd7cea296325c' into eclair-mr2
* commit '
da78534e3aefa41c7b76f6570cfcd7cea296325c':
ADT test fixes.
Raphael [Fri, 30 Oct 2009 02:31:07 +0000 (19:31 -0700)]
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.
OSDN Git Service
