OSDN Git Service
The Android Open Source Project [Wed, 2 Jun 2010 14:46:27 +0000 (07:46 -0700)]
am
2d75ee4a: merge from open-source master
Merge commit '
2d75ee4ad0034d81350602567b8d76b1278e7edc' into kraken
* commit '
2d75ee4ad0034d81350602567b8d76b1278e7edc':
removed unused imports
The Android Open Source Project [Wed, 2 Jun 2010 14:44:48 +0000 (07:44 -0700)]
merge from open-source master
Change-Id: I69d4b5355019fa58ef5a00e6f53e553ea71f2f90
The Android Open Source Project [Wed, 2 Jun 2010 14:42:49 +0000 (07:42 -0700)]
am
aebe000c: merge from open-source master
Merge commit '
aebe000cfa26eb84031f7385bf363868a70f39ff' into kraken
* commit '
aebe000cfa26eb84031f7385bf363868a70f39ff':
removed unused imports
The Android Open Source Project [Wed, 2 Jun 2010 14:41:00 +0000 (07:41 -0700)]
am
4bdec4ab: merge from open-source master
Merge commit '
4bdec4ab5d3deb28e29c460100a4e3c0b25d37cf' into kraken
* commit '
4bdec4ab5d3deb28e29c460100a4e3c0b25d37cf':
removed unused imports
The Android Open Source Project [Wed, 2 Jun 2010 14:37:37 +0000 (07:37 -0700)]
am
032ae72e: merge from open-source master
Merge commit '
032ae72e19d9a12fff483664b975392ef63f2fb7' into kraken
* commit '
032ae72e19d9a12fff483664b975392ef63f2fb7':
Removed unused import
The Android Open Source Project [Wed, 2 Jun 2010 14:37:13 +0000 (07:37 -0700)]
merge from open-source master
Change-Id: If08c1d42c870c8828b403ed322f3e93f07bb845a
The Android Open Source Project [Wed, 2 Jun 2010 14:35:57 +0000 (07:35 -0700)]
merge from open-source master
Change-Id: I0d2492c58689315f4caaa9bcb908296c26f53ed6
The Android Open Source Project [Wed, 2 Jun 2010 14:31:14 +0000 (07:31 -0700)]
am
43abe820: merge from open-source master
Merge commit '
43abe820f2a46746dcd7b86db593c08b9e1f938d' into kraken
* commit '
43abe820f2a46746dcd7b86db593c08b9e1f938d':
Reduced Warnings
The Android Open Source Project [Wed, 2 Jun 2010 14:30:37 +0000 (07:30 -0700)]
merge from open-source master
Change-Id: I3225d2a7b1e4b0ea60941a452285137980c1a921
The Android Open Source Project [Wed, 2 Jun 2010 14:28:32 +0000 (07:28 -0700)]
merge from open-source master
Change-Id: I6e4280a7f664c84bdd5205db642ed0ae63bc5e3b
The Android Open Source Project [Wed, 2 Jun 2010 14:27:39 +0000 (07:27 -0700)]
am
740c3e2e: merge from open-source master
Merge commit '
740c3e2e97a4cca24ecb534de72663ced238156a' into kraken
* commit '
740c3e2e97a4cca24ecb534de72663ced238156a':
Updated deprecated Contacts API to ContactsContract
The Android Open Source Project [Wed, 2 Jun 2010 14:27:37 +0000 (07:27 -0700)]
am
8cc5a816: merge from open-source master
Merge commit '
8cc5a8166dcdccfdb7f379a05190cef43f91c423' into kraken
* commit '
8cc5a8166dcdccfdb7f379a05190cef43f91c423':
Updated Sensor Samples to newest API
The Android Open Source Project [Wed, 2 Jun 2010 14:23:24 +0000 (07:23 -0700)]
merge from open-source master
Change-Id: I02c592cc054ac16e494ca7a34673ffb562287b01
The Android Open Source Project [Wed, 2 Jun 2010 14:22:11 +0000 (07:22 -0700)]
merge from open-source master
Change-Id: I900ca65f70c1a66781fb5f6f37c45961416d5650
Guang Zhu [Tue, 1 Jun 2010 22:55:21 +0000 (15:55 -0700)]
Merge "Add coverage_targets.xml into test image" into kraken
Guang Zhu [Tue, 1 Jun 2010 21:38:23 +0000 (14:38 -0700)]
Add coverage_targets.xml into test image
This file is needed to get coverage targets definition when running code
coverage
Change-Id: If48ad5d9693eaa5857a308f2d304f388d5d8c4d5
Kenny Root [Fri, 28 May 2010 21:24:49 +0000 (14:24 -0700)]
Add positional parameters to aid in i18n
Different languages might have different word orders, so add in
positional parameters for strings that have more than one substitution.
Change-Id: Ie9fc74eb0a22471b272e65c6cd521f1518b322d1
Yu Shan Emily Lau [Fri, 28 May 2010 22:54:27 +0000 (15:54 -0700)]
am
59b6dce0: am
39d7a745: Merge "Added the instrumentation and power log monkey events fro the new power framework." into froyo
Merge commit '
59b6dce0d5035b44dd8d99523efc63a469246f42' into kraken
* commit '
59b6dce0d5035b44dd8d99523efc63a469246f42':
Added the instrumentation and power log monkey events fro the new power framework.
Yu Shan Emily Lau [Fri, 28 May 2010 22:50:23 +0000 (15:50 -0700)]
am
39d7a745: Merge "Added the instrumentation and power log monkey events fro the new power framework." into froyo
Merge commit '
39d7a7451b7e43dc1d71ac983821e76c88775a81' into froyo-plus-aosp
* commit '
39d7a7451b7e43dc1d71ac983821e76c88775a81':
Added the instrumentation and power log monkey events fro the new power framework.
Yu Shan Emily Lau [Fri, 28 May 2010 22:38:48 +0000 (15:38 -0700)]
Merge "Added the instrumentation and power log monkey events fro the new power framework." into froyo
Yu Shan Emily Lau [Wed, 26 May 2010 18:42:13 +0000 (11:42 -0700)]
Added the instrumentation and power log monkey events fro the new power framework.
Change-Id: I3102e6caaba8763a2197ff80f13c8d127ea42316
Kenny Root [Wed, 26 May 2010 22:39:52 +0000 (15:39 -0700)]
am
8824549d: am
99cb1d16: Merge "Spelling fix for source download page" into froyo
Merge commit '
8824549dce27b5bb3085e6a83f06ca4d16b78ea6' into kraken
* commit '
8824549dce27b5bb3085e6a83f06ca4d16b78ea6':
Spelling fix for source download page
Kenny Root [Wed, 26 May 2010 22:38:05 +0000 (15:38 -0700)]
am
99cb1d16: Merge "Spelling fix for source download page" into froyo
Merge commit '
99cb1d16cc609866bb17c729d9b41926924ab4dd' into froyo-plus-aosp
* commit '
99cb1d16cc609866bb17c729d9b41926924ab4dd':
Spelling fix for source download page
Kenny Root [Wed, 26 May 2010 22:36:27 +0000 (15:36 -0700)]
Merge "Spelling fix for source download page" into froyo
Xavier Ducrohet [Wed, 26 May 2010 20:52:59 +0000 (13:52 -0700)]
am
6e6c1ebd: (-s ours) am
02ad7fc2: Move the rev of the froyo sdk component to 2. Do not merge
Merge commit '
6e6c1ebd77a6a353bf2af77035c73c606311d8c3' into kraken
* commit '
6e6c1ebd77a6a353bf2af77035c73c606311d8c3':
Move the rev of the froyo sdk component to 2. Do not merge
Xavier Ducrohet [Wed, 26 May 2010 20:51:54 +0000 (13:51 -0700)]
am
02ad7fc2: Move the rev of the froyo sdk component to 2. Do not merge
Merge commit '
02ad7fc23a8f6a6eddf8ac25138c78f2fd5e8ed7' into froyo-plus-aosp
* commit '
02ad7fc23a8f6a6eddf8ac25138c78f2fd5e8ed7':
Move the rev of the froyo sdk component to 2. Do not merge
Xavier Ducrohet [Wed, 26 May 2010 20:47:19 +0000 (13:47 -0700)]
Move the rev of the froyo sdk component to 2. Do not merge
Change-Id: I44b05cd40dad2df760d3d259246a714b82ddf9a2
Dirk Dougherty [Mon, 24 May 2010 17:25:09 +0000 (10:25 -0700)]
am
d43be56d: am
3c19d0e0: Doc change: increment androidappdocs version.
Merge commit '
d43be56d40a813bedf96203c4b58056c6139eec0' into kraken
* commit '
d43be56d40a813bedf96203c4b58056c6139eec0':
Doc change: increment androidappdocs version.
Dirk Dougherty [Mon, 24 May 2010 17:23:08 +0000 (10:23 -0700)]
am
3c19d0e0: Doc change: increment androidappdocs version.
Merge commit '
3c19d0e052fae5f21f8e8592143a24919b106743' into froyo-plus-aosp
* commit '
3c19d0e052fae5f21f8e8592143a24919b106743':
Doc change: increment androidappdocs version.
Dirk Dougherty [Mon, 24 May 2010 17:17:06 +0000 (10:17 -0700)]
Doc change: increment androidappdocs version.
Change-Id: Ifd517ed5c51cb95fdc4cc83d5521242086d59534
Andy McFadden [Fri, 21 May 2010 17:58:40 +0000 (10:58 -0700)]
Sim fixes.
Pulled a fix to the simulator app ("long" is 64-bit when 32-bit was
needed) from master. sim-eng is useful for verifying the x86 SMP stuff.
Also quieted a compiler warning.
Change-Id: I399ea4923b7e0650d5f995e056c751374b057fbd
Romain Guy [Fri, 21 May 2010 05:11:49 +0000 (22:11 -0700)]
Merge "removed unused imports"
Romain Guy [Fri, 21 May 2010 05:10:43 +0000 (22:10 -0700)]
Merge "removed unused imports"
Romain Guy [Fri, 21 May 2010 05:10:15 +0000 (22:10 -0700)]
Merge "removed unused imports"
Romain Guy [Fri, 21 May 2010 05:09:03 +0000 (22:09 -0700)]
Merge "Removed unused import"
Christian Mehlmauer [Thu, 20 May 2010 19:07:30 +0000 (21:07 +0200)]
removed unused imports
Change-Id: Ic48743a984bae2140e7e8f1b451be0f3760179f0
Christian Mehlmauer [Thu, 20 May 2010 19:06:37 +0000 (21:06 +0200)]
removed unused imports
Change-Id: I26fd85aa922e73c49ac319ed2b9f9e31603ced7b
Christian Mehlmauer [Thu, 20 May 2010 19:04:57 +0000 (21:04 +0200)]
removed unused imports
Change-Id: I1411ee3d0229918a6ff3837894d63f775550da27
Christian Mehlmauer [Thu, 20 May 2010 18:35:14 +0000 (20:35 +0200)]
Removed unused import
Change-Id: I85a1120ff8f9bc7186cdbc07c78d91a8d136fd5a
Christian Mehlmauer [Thu, 20 May 2010 18:13:51 +0000 (20:13 +0200)]
Reduced Warnings
Change-Id: I3ce0d27d24e8aad3fdbf8c57cefe39d1a3fd99e9
Romain Guy [Thu, 20 May 2010 05:06:53 +0000 (22:06 -0700)]
Merge "Updated deprecated Contacts API to ContactsContract"
Romain Guy [Thu, 20 May 2010 05:06:32 +0000 (22:06 -0700)]
Merge "Updated Sensor Samples to newest API"
Christian Mehlmauer [Wed, 19 May 2010 18:16:43 +0000 (20:16 +0200)]
Updated deprecated Contacts API to ContactsContract
Change-Id: I1d51b5eba579e841d6024eec08670ae8ff595f94
Christian Mehlmauer [Tue, 18 May 2010 21:40:33 +0000 (23:40 +0200)]
Updated Sensor Samples to newest API
Change-Id: I88c0ce08232fed34aa99c97385155220e7d9abff
The Android Open Source Project [Wed, 19 May 2010 15:18:13 +0000 (08:18 -0700)]
am
ca81fb41: merge from open-source master
Merge commit '
ca81fb411afd93378f01e3e13ef482693fd35a73' into kraken
* commit '
ca81fb411afd93378f01e3e13ef482693fd35a73':
Corrected StatusBarNotificationSample
The Android Open Source Project [Wed, 19 May 2010 15:13:51 +0000 (08:13 -0700)]
merge from open-source master
Change-Id: I4af8f65d1dfff3912f0057645943df78ddefc7ca
Guang Zhu [Wed, 19 May 2010 01:44:16 +0000 (18:44 -0700)]
Merge "code coverage improvement (DO NOT MERGE)" into kraken
Dianne Hackborn [Wed, 19 May 2010 01:33:05 +0000 (18:33 -0700)]
Small fix to surface window sample.
Change-Id: Iaae90aaf8cfdb71c6201eba8a436450a75b2b732
Christian Mehlmauer [Tue, 18 May 2010 21:44:32 +0000 (23:44 +0200)]
Corrected StatusBarNotificationSample
Change-Id: I892e84198cfe288e673b81e8ffc331525fee09b8
Dianne Hackborn [Tue, 18 May 2010 19:21:39 +0000 (12:21 -0700)]
Merge "Add new demo of taking over a window's surface." into kraken
The Android Open Source Project [Tue, 18 May 2010 17:59:19 +0000 (10:59 -0700)]
am
253290a7: merge from open-source master
Merge commit '
253290a70f2b8f9ca4f0e79b18d9c3f7fe82561b' into kraken
* commit '
253290a70f2b8f9ca4f0e79b18d9c3f7fe82561b':
Removed bad BuildPaths (not existing Directories after checkout)
The Android Open Source Project [Tue, 18 May 2010 17:56:24 +0000 (10:56 -0700)]
merge from open-source master
Change-Id: I5780767c96fbc775ce0dbbcfddb0c2e84bbfaf41
Guang Zhu [Thu, 15 Apr 2010 17:48:26 +0000 (10:48 -0700)]
code coverage improvement (DO NOT MERGE)
* automatically detect if emma is on device
* build emma into libcore if necessary
* stop runtime before adb sync and restart afterwards
Change-Id: Id5087fdd6c0345f2b9b76658a5083b9260af061e
Dianne Hackborn [Mon, 10 May 2010 18:30:38 +0000 (11:30 -0700)]
Add new demo of taking over a window's surface.
Change-Id: If76f577d2a314018d7dc7980ffa446b7cf050037
The Android Open Source Project [Tue, 18 May 2010 16:31:32 +0000 (09:31 -0700)]
am
c043a97c: merge from open-source master
Merge commit '
c043a97c9f3e1a2c8b5a95df70b89c711a1087ce' into kraken
* commit '
c043a97c9f3e1a2c8b5a95df70b89c711a1087ce':
Removed Calls to deprecated API
Removed Duplicate Build Paths
The Android Open Source Project [Tue, 18 May 2010 16:27:19 +0000 (09:27 -0700)]
merge from open-source master
Change-Id: Ib0c6bef7b527a79c9902046889e29a4bccd0ab87
Christian Mehlmauer [Tue, 18 May 2010 04:53:36 +0000 (06:53 +0200)]
Removed bad BuildPaths (not existing Directories after checkout)
Change-Id: Ia21cb1927dfc8851f728ef3a2175cbdf701f7641
Jean-Baptiste Queru [Mon, 17 May 2010 22:02:56 +0000 (15:02 -0700)]
Merge "Removed Duplicate Build Paths"
Christian Mehlmauer [Mon, 17 May 2010 18:36:01 +0000 (20:36 +0200)]
Removed Calls to deprecated API
Change-Id: Ia94734637df6aa7b8b08417c49a3485f34f1b94c
Christian Mehlmauer [Sun, 16 May 2010 20:46:34 +0000 (22:46 +0200)]
Removed Duplicate Build Paths
Change-Id: I9b4d4d5163365cde3c97d0d8f05b38a4b8406cea
The Android Open Source Project [Wed, 12 May 2010 16:36:11 +0000 (09:36 -0700)]
am
99096976: merge from open-source master
Merge commit '
99096976d0ed8436c0eacdefae0ffb606bd573c5' into kraken
* commit '
99096976d0ed8436c0eacdefae0ffb606bd573c5':
Added missing --pct-syskeys to processOptions in Monkey
The Android Open Source Project [Wed, 12 May 2010 16:27:49 +0000 (09:27 -0700)]
merge from open-source master
Change-Id: I4bbf0fccef174a7f0eb8241b422f846ea21c3349
Dirk Dougherty [Tue, 11 May 2010 17:23:32 +0000 (10:23 -0700)]
am
8bfa91f0: am
56c8df1b: sdk change: add index for tictactoe library and app. fix output path for spinner sample app in sdk builds.
Merge commit '
8bfa91f076b667223920d8b68c8ab0f6e8dbc164' into kraken
* commit '
8bfa91f076b667223920d8b68c8ab0f6e8dbc164':
sdk change: add index for tictactoe library and app. fix output path for spinner sample app in sdk builds.
Dirk Dougherty [Tue, 11 May 2010 17:18:43 +0000 (10:18 -0700)]
am
56c8df1b: sdk change: add index for tictactoe library and app. fix output path for spinner sample app in sdk builds.
Merge commit '
56c8df1b0637c380bd7aa3f9a928430abfba2c7d' into froyo-plus-aosp
* commit '
56c8df1b0637c380bd7aa3f9a928430abfba2c7d':
sdk change: add index for tictactoe library and app. fix output path for spinner sample app in sdk builds.
Johan Alfven [Tue, 11 May 2010 07:05:28 +0000 (09:05 +0200)]
Added missing --pct-syskeys to processOptions in Monkey
According to the developer guidelines
http://developer.android.com/guide/developing/tools/monkey.html
it should be possible to run monkey with option --pct-syskeys <percent>
to adjust percentage of "system" key events. (These are keys that are
generally reserved for use by the system, such as Home, Back,
Start Call, End Call, or Volume controls.) However, when trying
to run monkey with that option it fails with:
** Error: Unknown option: --pct-syskeys
The function processOptions in file Monkey.java was missing the
option --pct-syskeys.
Change-Id: I5d328fc93dfe67ed7a905735d6762c7f91c69838
Dirk Dougherty [Sun, 9 May 2010 00:15:10 +0000 (17:15 -0700)]
sdk change: add index for tictactoe library and app. fix output path for spinner sample app in sdk builds.
Change-Id: I51d412e1e78e6bd672eb419d53310eb1194672a3
Scott Main [Mon, 10 May 2010 20:48:59 +0000 (13:48 -0700)]
am
46ea5655: am
6807387d: change searchable dictionary folder name back to normal (exclude "v2", which should instead be used only for HTML titles)
Merge commit '
46ea565515a1ab4f3bc4107eae8c0e909b634dac' into kraken
* commit '
46ea565515a1ab4f3bc4107eae8c0e909b634dac':
change searchable dictionary folder name back to normal (exclude "v2", which
Scott Main [Mon, 10 May 2010 20:48:57 +0000 (13:48 -0700)]
am
e7506f83: am
1b2c8084: add version code and name to searchable dictionary sample (make it v2)
Merge commit '
e7506f830636bfb3425b0efb6f8a8675cb1717c6' into kraken
* commit '
e7506f830636bfb3425b0efb6f8a8675cb1717c6':
add version code and name to searchable dictionary sample (make it v2)
Scott Main [Mon, 10 May 2010 20:47:14 +0000 (13:47 -0700)]
am
6807387d: change searchable dictionary folder name back to normal (exclude "v2", which should instead be used only for HTML titles)
Merge commit '
6807387d71dbcad1577edc3b2a88e11eda0aa8c0' into froyo-plus-aosp
* commit '
6807387d71dbcad1577edc3b2a88e11eda0aa8c0':
change searchable dictionary folder name back to normal (exclude "v2", which
Scott Main [Mon, 10 May 2010 20:47:12 +0000 (13:47 -0700)]
am
1b2c8084: add version code and name to searchable dictionary sample (make it v2)
Merge commit '
1b2c80841221bb69ca0384974fab462156cfc07d' into froyo-plus-aosp
* commit '
1b2c80841221bb69ca0384974fab462156cfc07d':
add version code and name to searchable dictionary sample (make it v2)
Scott Main [Mon, 10 May 2010 15:04:51 +0000 (08:04 -0700)]
change searchable dictionary folder name back to normal (exclude "v2", which
should instead be used only for HTML titles)
Change-Id: Ia5c08478d91fb8aa6246fcbca3d68337becadf65
Scott Main [Fri, 7 May 2010 22:10:14 +0000 (15:10 -0700)]
add version code and name to searchable dictionary sample (make it v2)
Change-Id: Ie19c107528ef0df715936303baeda002efaef6cb
Xavier Ducrohet [Mon, 10 May 2010 16:47:30 +0000 (09:47 -0700)]
am
33c1d23b: am
ca2327f1: Merge "Fix target for library sample" into froyo
Merge commit '
33c1d23b012e9351667c85b2769b838a7f12b727' into kraken
* commit '
33c1d23b012e9351667c85b2769b838a7f12b727':
Fix target for library sample
Xavier Ducrohet [Mon, 10 May 2010 16:43:08 +0000 (09:43 -0700)]
am
ca2327f1: Merge "Fix target for library sample" into froyo
Merge commit '
ca2327f1d44fcd66c4a9396e4e70471f1075eae6' into froyo-plus-aosp
* commit '
ca2327f1d44fcd66c4a9396e4e70471f1075eae6':
Fix target for library sample
Xavier Ducrohet [Fri, 7 May 2010 17:58:32 +0000 (10:58 -0700)]
Merge "Fix target for library sample" into froyo
Xavier Ducrohet [Fri, 7 May 2010 17:57:58 +0000 (10:57 -0700)]
Fix target for library sample
Change-Id: I89a1b6a7c7803ac52f5872e4b8a8696bb32ca5a3
Joe Malin [Fri, 7 May 2010 16:55:34 +0000 (09:55 -0700)]
am
10cedd23: am
527cfd6e: Doc change: cherry-pick from master: Files for the Spinner and SpinnerTest sample applications...
Merge commit '
10cedd234b31ab785c61ddf3f101d9a5980a0ec2' into kraken
* commit '
10cedd234b31ab785c61ddf3f101d9a5980a0ec2':
Doc change: cherry-pick from master: Files for the Spinner and SpinnerTest sample applications...
Joe Malin [Fri, 7 May 2010 16:54:29 +0000 (09:54 -0700)]
am
527cfd6e: Doc change: cherry-pick from master: Files for the Spinner and SpinnerTest sample applications...
Merge commit '
527cfd6ef30a92a679aa2fff3d57f7024cebf609' into froyo-plus-aosp
* commit '
527cfd6ef30a92a679aa2fff3d57f7024cebf609':
Doc change: cherry-pick from master: Files for the Spinner and SpinnerTest sample applications...
Joe Malin [Wed, 21 Apr 2010 02:54:58 +0000 (19:54 -0700)]
Doc change: cherry-pick from master: Files for the Spinner and SpinnerTest sample applications...
Change-Id: Ic4a1d28ea821ab7e35255d5a62ca0978cb9155ba
Dirk Dougherty [Fri, 7 May 2010 16:21:55 +0000 (09:21 -0700)]
am
9e678c26: am
2f0b1c13: Doc change: cherry-pick from ->Subject: Android application files for the Activity Testing Tutorial
Merge commit '
9e678c26d81ba76ad48e73cb7c78a6210cd91a7b' into kraken
* commit '
9e678c26d81ba76ad48e73cb7c78a6210cd91a7b':
Doc change: cherry-pick from master. ->Subject: Android application files for the Activity Testing Tutorial
Dirk Dougherty [Fri, 7 May 2010 16:20:00 +0000 (09:20 -0700)]
am
2f0b1c13: Doc change: cherry-pick from ->Subject: Android application files for the Activity Testing Tutorial
Merge commit '
2f0b1c1335f6212889633e170d71c56dba70e78e' into froyo-plus-aosp
* commit '
2f0b1c1335f6212889633e170d71c56dba70e78e':
Doc change: cherry-pick from master. ->Subject: Android application files for the Activity Testing Tutorial
Dirk Dougherty [Fri, 7 May 2010 16:11:24 +0000 (09:11 -0700)]
Doc change: cherry-pick from ->Subject: Android application files for the Activity Testing Tutorial
Conflicts:
build/sdk.atree
Change-Id: I5edb1d4d8a18fbda53a0e78ca6c9d20cf7d3ff4a
Xavier Ducrohet [Fri, 7 May 2010 00:39:57 +0000 (17:39 -0700)]
am
e823f9eb: am
cf997049: Fix the Library sample.
Merge commit '
e823f9ebc789718ee9061856f1f3951bfec562e1' into kraken
* commit '
e823f9ebc789718ee9061856f1f3951bfec562e1':
Fix the Library sample.
Xavier Ducrohet [Fri, 7 May 2010 00:38:30 +0000 (17:38 -0700)]
am
cf997049: Fix the Library sample.
Merge commit '
cf9970499bfcce80d92c2fe37fd552e586c177b6' into froyo-plus-aosp
* commit '
cf9970499bfcce80d92c2fe37fd552e586c177b6':
Fix the Library sample.
Xavier Ducrohet [Fri, 7 May 2010 00:38:24 +0000 (17:38 -0700)]
am
5542d32c: am
fc7428f9: Add the TicTacToe Lib+Main samples
Merge commit '
5542d32c67e31f4e39ff33904613ec722d42ddd1' into kraken
* commit '
5542d32c67e31f4e39ff33904613ec722d42ddd1':
Add the TicTacToe Lib+Main samples
Xavier Ducrohet [Fri, 7 May 2010 00:36:56 +0000 (17:36 -0700)]
am
fc7428f9: Add the TicTacToe Lib+Main samples
Merge commit '
fc7428f91254740a245fdac5db77d035c0b4c41f' into froyo-plus-aosp
* commit '
fc7428f91254740a245fdac5db77d035c0b4c41f':
Add the TicTacToe Lib+Main samples
Xavier Ducrohet [Fri, 7 May 2010 00:35:35 +0000 (17:35 -0700)]
Fix the Library sample.
Change-Id: I38d0336b8f1952d4e0424501dcd060d173624b5b
Xavier Ducrohet [Thu, 6 May 2010 23:53:09 +0000 (16:53 -0700)]
Add the TicTacToe Lib+Main samples
Change-Id: I17a26172ab82b2e4b794774c5ab94bed8202b7d4
The Android Open Source Project [Thu, 6 May 2010 22:16:03 +0000 (15:16 -0700)]
am
02d92477: Merge commit \'goog/readonly-korg-master\' into HEAD
Merge commit '
02d92477d5bd290eb8cd1ef7e13e903520ebba05' into kraken
* commit '
02d92477d5bd290eb8cd1ef7e13e903520ebba05':
Update sdk.atree with new ant rules location.
The Android Open Source Project [Thu, 6 May 2010 22:07:55 +0000 (15:07 -0700)]
Merge commit 'goog/readonly-korg-master' into HEAD
Kenny Root [Thu, 6 May 2010 16:20:01 +0000 (09:20 -0700)]
Update classpath for Eclipse DO NOT MERGE
Change-Id: Id16bde9c7eef953e7c31f86e8c485a9025294586
Kenny Root [Thu, 6 May 2010 01:06:45 +0000 (18:06 -0700)]
Spelling fix for source download page
Change-Id: I177310b80a2fe632823b6c7b7b63ec11e8e6e829
Xavier Ducrohet [Wed, 5 May 2010 21:13:49 +0000 (14:13 -0700)]
Update sdk.atree with new ant rules location.
Change-Id: I8ff92a2343e1a4aa13ad4e8751e2a135eac09425
Xavier Ducrohet [Wed, 5 May 2010 21:13:49 +0000 (14:13 -0700)]
Update sdk.atree with new ant rules location.
Change-Id: I69cd421f36c8ea2b41b3f22f053489ac7dc5e3e9
The Android Open Source Project [Mon, 3 May 2010 22:25:26 +0000 (15:25 -0700)]
merge from open-source master
Change-Id: Iee26d951b665e3cec3487dee026f6b529ea2c64d
Jean-Baptiste Queru [Mon, 3 May 2010 19:38:07 +0000 (12:38 -0700)]
Adapt to new location of libcore
Change-Id: I82b330562b4f0d2024e4fbe8235250abb029470c
The Android Open Source Project [Wed, 28 Apr 2010 19:55:21 +0000 (12:55 -0700)]
merge from open-source master
Change-Id: I5b1a7e1448dc3bfeb499201e0332de550da1380a
Xavier Ducrohet [Tue, 27 Apr 2010 23:05:41 +0000 (16:05 -0700)]
Package Ant rules r3
Change-Id: I2c5fca2ac89a54499f243670bbe858affa8770c3
Scott Main [Tue, 27 Apr 2010 17:35:50 +0000 (10:35 -0700)]
am
3adbb98d: Merge "title the searchable dictionary app as "v2" because it includes significant changes and it\'s worth highlighting the revision. some revisions to the sample desciption. a companion change to the resources navigation link will follow (to name it v2)."
Merge commit '
3adbb98dff3b1cbafcd9aadfc8708f4b88030497' into froyo-plus-aosp
* commit '
3adbb98dff3b1cbafcd9aadfc8708f4b88030497':
title the searchable dictionary app as "v2" because it includes significant
Scott Main [Tue, 27 Apr 2010 17:32:44 +0000 (10:32 -0700)]
Merge "title the searchable dictionary app as "v2" because it includes significant changes and it's worth highlighting the revision. some revisions to the sample desciption. a companion change to the resources navigation link will follow (to name it v2)." into froyo
OSDN Git Service
