OSDN Git Service
Kenny Root [Wed, 26 May 2010 22:43:03 +0000 (15:43 -0700)]
am
13cf156b: am
8824549d: am
99cb1d16: Merge "Spelling fix for source download page" into froyo
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:55:37 +0000 (13:55 -0700)]
am
d9c6e694: (-s ours) am
6e6c1ebd: (-s ours) am
02ad7fc2: Move the rev of the froyo sdk component to 2. Do not merge
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
Bill Napier [Tue, 25 May 2010 21:32:56 +0000 (14:32 -0700)]
- Improve ScriptRunner command line parsing to actually pass more of the arguments. (And a unit test to go with it).
- Set __name__ inside the scriptfile runner so python scripts expecting it get it.
- Propagate sys.exit error codes so monkeyrunner will actually return those error codes.
- Better handle PyExceptions thrown by the script to actually terminate monkeyrunner.
- Bubble up installPackage and removePackage error codes so callers can tell if they worked or not.
Change-Id: Ia4717b1ad2c9b4cccd607aba00211f2f85dfb412
Bill Napier [Tue, 25 May 2010 16:52:14 +0000 (09:52 -0700)]
Merge "Add in python unit tests and fix up java unit tests."
Bill Napier [Mon, 24 May 2010 22:08:21 +0000 (15:08 -0700)]
Add in python unit tests and fix up java unit tests.
Change-Id: I3930946364d5ca8a5d18e4a2b36a7afa298ef2de
Marco Nelissen [Mon, 24 May 2010 22:19:31 +0000 (15:19 -0700)]
Add missing properties to make the simulator work again.
Change-Id: I9c650360705960630198cb8006a3f83188ddd345
Bill Napier [Mon, 24 May 2010 19:14:40 +0000 (12:14 -0700)]
Merge "Add in "plugin" support to allow users to add their own plugin's via JAR files and the -plugin command line argument. Also make sure that the arguments passed on the command line correctly get set in sys.argv."
Bill Napier [Fri, 21 May 2010 18:08:23 +0000 (11:08 -0700)]
Add in "plugin" support to allow users to add their own plugin's via JAR files and the -plugin command line argument.
Also make sure that the arguments passed on the command line correctly get set in sys.argv.
Change-Id: I35014adc95ac9e5e5c777dc17749ee2b9b155c57
Dirk Dougherty [Mon, 24 May 2010 17:28:24 +0000 (10:28 -0700)]
am
b2d652d1: am
d43be56d: am
3c19d0e0: Doc change: increment androidappdocs version.
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
Andrew Stadler [Fri, 21 May 2010 21:59:30 +0000 (14:59 -0700)]
add frameworks/base/vcard/java to fix eclipse
Change-Id: I087266f22d8e95bc6d088e07d1da7dc62e32c1eb
Andy McFadden [Fri, 21 May 2010 18:09:55 +0000 (11:09 -0700)]
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
Bill Napier [Fri, 21 May 2010 17:29:40 +0000 (10:29 -0700)]
Merge "Add in stub backend to be used for jython unit tests."
Bill Napier [Thu, 20 May 2010 21:44:14 +0000 (14:44 -0700)]
Add in stub backend to be used for jython unit tests.
Change-Id: Idb7a18ce1ddeb8621c688d5580515d10db6edf19
Bill Napier [Fri, 21 May 2010 17:00:37 +0000 (10:00 -0700)]
Merge "Add in the help command implementation to return the "help" string to the caller."
Bill Napier [Thu, 20 May 2010 21:41:26 +0000 (14:41 -0700)]
Add in the help command implementation to return the "help" string to the caller.
Change-Id: Icb350e4c1cb5ce219ea5ae90272dd7bbaba283e3
Bill Napier [Thu, 20 May 2010 21:32:36 +0000 (14:32 -0700)]
remove DebugBridge as it has been replaced with AdbBackend
Change-Id: I52270f2d4ee137932a32309812a8a20503839035
Bill Napier [Tue, 18 May 2010 19:21:00 +0000 (12:21 -0700)]
Refactor MonkeyRunner and add in a lot of API operations.
Change-Id: I96ad1da5dc94c86c1e47ff1acf6843d282bb4724
Dianne Hackborn [Thu, 20 May 2010 02:21:19 +0000 (19:21 -0700)]
Add new fragment demo for changing with config.
This changes the FragmentLayout demo to show how the layout
(and entire UI flow) can easily be changed based on screen configuration
using fragments. Here we have different UI for landscape vs portrait.
The old FragmentLayout demo is renamed to FragmentAnim and extended a
bit.
Various other tweaks to follow fragment API changes.
Change-Id: I8df918dbf32b3617cae2b20f77eb37d8211b8c89
Jaikumar Ganesh [Wed, 19 May 2010 18:57:21 +0000 (11:57 -0700)]
Update Bluetooth documentation.
Change-Id: I64a26e2c44bcff739380fe31ce5f6d1e06722282
The Android Open Source Project [Wed, 19 May 2010 15:20:53 +0000 (08:20 -0700)]
am
d350cf1b: am
ca81fb41: merge from open-source master
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:46:43 +0000 (18:46 -0700)]
am
1a3ab7bf: (-s ours) Merge "code coverage improvement (DO NOT MERGE)" into kraken
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:37:20 +0000 (18:37 -0700)]
am
689868ac: Small fix to surface window sample.
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
Vladimir Chtchetkine [Tue, 18 May 2010 21:06:16 +0000 (14:06 -0700)]
Merge "Add Samsung VID/PID to android_winusb.inf fixing bug
2687489"
Vladimir Chtchetkine [Tue, 18 May 2010 20:45:36 +0000 (13:45 -0700)]
Add Samsung VID/PID to android_winusb.inf fixing bug
2687489
Change-Id: I31baae3400ef8ef04270fd17352ee81cd244d779
Dianne Hackborn [Tue, 18 May 2010 19:24:57 +0000 (12:24 -0700)]
am
5ee6d7a1: Merge "Add new demo of taking over a window\'s surface." into kraken
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
Bill Napier [Tue, 18 May 2010 18:22:18 +0000 (11:22 -0700)]
Add in method to ScriptRunner to also get a variable result from the interpreter.
Change-Id: Ib14d48992b66371a6702a7dac621bf3a62d1a936
The Android Open Source Project [Tue, 18 May 2010 18:02:06 +0000 (11:02 -0700)]
am
f8402ac0: am
253290a7: merge from open-source master
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:34:21 +0000 (09:34 -0700)]
am
3dcb1f7a: am
c043a97c: merge from open-source master
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
Bill Napier [Tue, 18 May 2010 04:17:41 +0000 (21:17 -0700)]
Add proper dependencies for Test target.
Change-Id: I44cd7b13d0d96181908826423cd2b3a320b9cc65
Bill Napier [Tue, 18 May 2010 00:05:57 +0000 (17:05 -0700)]
Merge "Update ScriptRunner to correctly pass in the name of the sript being started (so jython's sys.argv will work). Add in JythinUtils Unit Tests to validate JythonUtils correctness."
Dan Morrill [Mon, 17 May 2010 20:02:19 +0000 (13:02 -0700)]
More "final" content changes for source.android.com relaunch.
Change-Id: Ic66dc400c955d270e79af5e0edfa1fdce1036fcb
Dan Morrill [Thu, 6 May 2010 15:54:16 +0000 (08:54 -0700)]
Tweaking a FAQ per feedback.
Change-Id: I6bc90b8d4e78c67014ed6f7e92387ace1a7ebd39
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
Bill Napier [Mon, 17 May 2010 18:02:31 +0000 (11:02 -0700)]
Update ScriptRunner to correctly pass in the name of the sript being started (so jython's sys.argv will work).
Add in JythinUtils Unit Tests to validate JythonUtils correctness.
Change-Id: I41ea78b3efbb8649840b46c279f3e91f12b960ac
Christian Mehlmauer [Sun, 16 May 2010 20:46:34 +0000 (22:46 +0200)]
Removed Duplicate Build Paths
Change-Id: I9b4d4d5163365cde3c97d0d8f05b38a4b8406cea
Bill Napier [Fri, 14 May 2010 20:34:04 +0000 (13:34 -0700)]
Add in a collection of useful functions for interacting with the Jython Interpreter.
Change-Id: I1cef598fe8f057ed050452e4928196f815e574b5
Bill Napier [Fri, 14 May 2010 20:11:26 +0000 (13:11 -0700)]
Merge "Annotation to allow auto-documenting of jython language bindings for MonkeyRunner API's."
Bill Napier [Fri, 14 May 2010 19:42:50 +0000 (12:42 -0700)]
Annotation to allow auto-documenting of jython language bindings for MonkeyRunner API's.
Change-Id: Ia0af839df646036a7ecd9f9c6ba02f98dc911f45
Dianne Hackborn [Fri, 14 May 2010 07:46:24 +0000 (00:46 -0700)]
New API demo of Fragment.startActivityForResult().
Change-Id: I87c5851bfaf3fa84bf57c101bab05b9a1911585d
Ben Murdoch [Wed, 12 May 2010 13:09:26 +0000 (14:09 +0100)]
Merge Webkit at r58956: Plugin code has switched to C99 integer types. See trac.webkit.org/changeset/58590
Change-Id: Id521afd66935db6149a341f89ab6b4d7440e4695
Dianne Hackborn [Thu, 13 May 2010 01:58:18 +0000 (18:58 -0700)]
Update fragment API demos for new fragment APIs:
- Correctly work with state saving and restoring.
- Add new sample showing a fragment that is retained across activities.
Change-Id: I7b1e02135177e69e9fff23fcc55e86d93a75c7e0
The Android Open Source Project [Wed, 12 May 2010 16:51:39 +0000 (09:51 -0700)]
am
08d31102: am
99096976: merge from open-source master
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:27:58 +0000 (10:27 -0700)]
am
529ba2e5: am
8bfa91f0: am
56c8df1b: 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: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:51:41 +0000 (13:51 -0700)]
am
07155b40: am
46ea5655: am
6807387d: change searchable dictionary folder name back to normal (exclude "v2", which should instead be used only for HTML titles)
Scott Main [Mon, 10 May 2010 20:51:36 +0000 (13:51 -0700)]
am
689176f3: am
e7506f83: am
1b2c8084: add version code and name to searchable dictionary sample (make it v2)
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:50:58 +0000 (09:50 -0700)]
am
54d1f9c9: am
33c1d23b: am
ca2327f1: Merge "Fix target for library sample" into froyo
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
Dianne Hackborn [Fri, 7 May 2010 18:25:50 +0000 (11:25 -0700)]
Update to follow fragment APIs.
Change-Id: If7f4d2465590cd27aed04d2675498fbe59474728
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 17:53:13 +0000 (10:53 -0700)]
am
13318841: am
10cedd23: am
527cfd6e: Doc change: cherry-pick from master: Files for the Spinner and SpinnerTest sample applications...
Dirk Dougherty [Fri, 7 May 2010 17:44:30 +0000 (10:44 -0700)]
Merge commit '
0f7185d9' into master, resolve conflicts.
Conflicts:
samples/Spinner/_index.html
samples/SpinnerTest/AndroidManifest.xml
samples/SpinnerTest/_index.html
samples/SpinnerTest/src/com/android/example/spinner/test/SpinnerActivityTest.java
Change-Id: Ibd2bbd81c828c4a4337d2d0e397bd9a0b1e90728
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:43:34 +0000 (17:43 -0700)]
am
fd51be7a: am
e823f9eb: am
cf997049: Fix the Library sample.
Xavier Ducrohet [Fri, 7 May 2010 00:42:06 +0000 (17:42 -0700)]
am
03c7c8b6: am
5542d32c: am
fc7428f9: Add the TicTacToe Lib+Main samples
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
OSDN Git Service
