OSDN Git Service
Xavier Ducrohet [Tue, 27 Jul 2010 22:07:35 +0000 (15:07 -0700)]
Re-organize the SDK, moving the build tools out of the platforms.
Change-Id: I4526310a1c882ad33084d94e118b1c74b3181a6a
Brett Chabot [Wed, 28 Jul 2010 00:57:38 +0000 (17:57 -0700)]
Change hosttestlib to use ddm-prebuilt.
Change-Id: Ibd1c44096893bc8804a4d7644fc83d2edd443bb2
Bill Napier [Tue, 27 Jul 2010 23:08:06 +0000 (16:08 -0700)]
Remove monkeyrunner so it can move to the SDK project.
Change-Id: Ibedfae41cf8a71d66f25267cd3a360de222e2644
Xavier Ducrohet [Wed, 21 Jul 2010 23:50:22 +0000 (16:50 -0700)]
Update the monkeyrunner to use the new DDMlib API.
Change-Id: I0c1e17b450e264ca1e7d98523bde4ddfe1d97252
Jean-Baptiste Queru [Sat, 24 Jul 2010 01:35:58 +0000 (18:35 -0700)]
Merge "Corrected Classpath"
Vairavan Srinivasan [Tue, 20 Jul 2010 21:09:17 +0000 (14:09 -0700)]
Monkey: Changes to release lock before reporting ANR and meminfo
Report ANR, dumpsys after releasing lock on Monkey.this.
This ensures the availability of the lock to Activity controller's
appNotResponding.
Reporting dumpsys while holding the lock on this causes a cyclic
deadlock, when twoANRs are reported (one after the other).
Monkey's ActivityController is registered to ActivityManagerService
for handling ANR.The first ANR caused by either service timeout or
broadcast timeout is reported byActivityManagerService to Monkey's
ActivityController via Binder. Meanwhile, the lock on
ActivityManagerService is held by serviceTimeout or broadcastTimeout.
appNotResponding corresponding to first ANR reports procrank and
acquires a lock onMonkey.this and sets few bool variables like
mRequestAnrTraces and mRequestDumpsysMemInfoand returns the control
to ActivityManagerService's service/broadcast timeout.
VM executing monkey process switches the control to main monkey
thread and it acquires thelock on Monkey.this and proceeds to report
ANR traces.
Meanwhile, a second ANR occurs and Activity Manager Service invokes
ActivityController's appNotResponding (via binder). appNotResponding
reports the procrank and waits to acquire the lock on Monkey.this
which is being held by Monkey's main thread(busy reporting first ANR).
This results in a blocking wait for ActivityManagerService's
appNotRespondingLocked() (corresponding to second ANR).
Meanwhile, the monkey's main thread (holding lock on Monkey.this)
tries to report the meminfo for first ANR, invokes
reportDumpsysMemInfo(), which in turn causes the android runtime to
launch dumpsys process. The dumpsys process queries service manager
to get a reference to meminfo service and invoke dump() on the same.
The meminfo service is created by ActivityManagerService's
setSystemProcess(). The dump() method tries to acquire a lock on
ActivityManagerService which is held by ActivityManagerService's
service/broadcasttimeout (awaiting the response from
ActivityController for the second ANR).
This cyclic deadlock continues for a minute after which WatchDog
thread of system_server kills system_server as it hasn't got the
response from ActivityManagerService's monitor(). The monitor()
of ActivityManagerService too tries to acquire lock on this and is
invoked once in every minute.
DEADLOCK:
--------
ActivityManager --> ActivityController --> Monkey Main --> MemInfo
--> ActivityManager
Change-Id: I7718eff332e5551b1950ab1c45395bf1ff4b1bda
Christian Mehlmauer [Fri, 25 Jun 2010 15:03:51 +0000 (17:03 +0200)]
Corrected Classpath
Removed Alarmclock app, due it's not needed any more and causes Errors with DeskClock
Removed not existing google Folders in out dir
Corrected path for frameworks/ex
Change-Id: I9d947f1e257cacc2142b141c2f2fe77076330705
Jean-Baptiste Queru [Thu, 8 Jul 2010 23:23:59 +0000 (16:23 -0700)]
Merge "update 404'd source.android.com URLs"
Christian Mehlmauer [Fri, 2 Jul 2010 14:20:49 +0000 (16:20 +0200)]
Cleaned up LunarLander sample
Change-Id: If2cc44c8312cebce170d07c34c64ea2ce1e5b7ab
Chris Peterson [Sat, 26 Jun 2010 00:32:07 +0000 (17:32 -0700)]
update 404'd source.android.com URLs
Change-Id: I088f32ca3a8b8568230e068a78b78dee7d6e4924
Yu Shan Emily Lau [Thu, 24 Jun 2010 22:42:29 +0000 (15:42 -0700)]
am
1a132581: Merge "Add the AUTOTEST_TEST_BEGIN_DELAY keyword to the scripted monkey which allow the power log to start 10 seconds after the event was send out." into froyo
Merge commit '
1a132581a5ce6188989d8522d227392c05cb42f6' into froyo-plus-aosp
* commit '
1a132581a5ce6188989d8522d227392c05cb42f6':
Add the AUTOTEST_TEST_BEGIN_DELAY keyword to the scripted monkey which allow the power log to start 10 seconds after the event was send out.
Yu Shan Emily Lau [Thu, 24 Jun 2010 22:30:29 +0000 (15:30 -0700)]
Merge "Add the AUTOTEST_TEST_BEGIN_DELAY keyword to the scripted monkey which allow the power log to start 10 seconds after the event was send out." into froyo
Yu Shan Emily Lau [Thu, 24 Jun 2010 21:20:16 +0000 (14:20 -0700)]
Add the AUTOTEST_TEST_BEGIN_DELAY keyword to the scripted monkey which allow the power log to start 10 seconds after the event was send out.
Change-Id: I3d98d56128b8a96ba712c7e11280e3ab88a7cc4a
The Android Open Source Project [Thu, 24 Jun 2010 21:02:21 +0000 (14:02 -0700)]
merge from open-source master
Change-Id: Ie72de601744653bcd7e9fa3debe71d3c8f2fe591
Raphael Moll [Wed, 23 Jun 2010 22:59:59 +0000 (15:59 -0700)]
Moving SDK howto docs from development.git into sdk.git.
See Change I7827d3f3cc6b8ba96822170949618dc75d879d28 for
the CL that adds them back in sdk.git
Change-Id: I37a5b27875fc3ed6b52202ab8435888d38644ca5
Scott Main [Wed, 23 Jun 2010 01:42:23 +0000 (18:42 -0700)]
am
81b9c9d8: docs: fix doc link bug
Merge commit '
81b9c9d8ea3f6b13f03249b437ab5d51cdcb5590' into froyo-plus-aosp
* commit '
81b9c9d8ea3f6b13f03249b437ab5d51cdcb5590':
docs: fix doc link bug
Scott Main [Tue, 22 Jun 2010 17:37:30 +0000 (10:37 -0700)]
docs: fix doc link bug
bug:
2788457
Change-Id: Ia4ad8cfcee24db2e7cb509952c606508c2fd01c9
The Android Open Source Project [Fri, 18 Jun 2010 18:33:52 +0000 (11:33 -0700)]
merge from open-source master
Change-Id: I4e06b684dd46c317e1c206e584050dbee20be281
Xavier Ducrohet [Wed, 16 Jun 2010 01:04:44 +0000 (18:04 -0700)]
remove apkbuilder.jar from the sdk build.
Change-Id: I82cca5c159c1f3210b98deebfd78e2844728b2ac
The Android Open Source Project [Tue, 15 Jun 2010 22:02:27 +0000 (15:02 -0700)]
merge from open-source master
Change-Id: I3e12f866966fda80db5a0795eba9ff82bfe6547d
Xavier Ducrohet [Tue, 15 Jun 2010 20:00:13 +0000 (13:00 -0700)]
remove jarutils from the sdk packaging.
Change-Id: Ic3c91ff5e20a5bf6b7c3ad11eb6e6f4250c7613d
The Android Open Source Project [Mon, 14 Jun 2010 17:49:52 +0000 (10:49 -0700)]
merge from open-source master
Change-Id: I7d0f3b08f6e632b689c870017374741a544bc7e8
The Android Open Source Project [Mon, 14 Jun 2010 17:01:48 +0000 (10:01 -0700)]
merge from open-source master
Change-Id: Icb039ab90287961b1ad358b78eaead4a9aa2ae59
The Android Open Source Project [Mon, 14 Jun 2010 16:31:39 +0000 (09:31 -0700)]
merge from open-source master
Change-Id: I6d060597c1dffd56aacc0072104464ad651ef877
The Android Open Source Project [Mon, 14 Jun 2010 16:26:36 +0000 (09:26 -0700)]
merge from open-source master
Change-Id: Iedee6a43e23821175148324bc2502a33112e2d59
Jean-Baptiste Queru [Mon, 14 Jun 2010 16:20:43 +0000 (09:20 -0700)]
Merge "Cleaned up Samples by removing unsed imports and variables. Changed deprecated Config.LOGD to Config.DEBUG Removed unnecessary whitespaces"
Christian Mehlmauer [Thu, 20 May 2010 19:02:04 +0000 (21:02 +0200)]
Cleaned up Samples by removing unsed imports and variables.
Changed deprecated Config.LOGD to Config.DEBUG
Removed unnecessary whitespaces
Change-Id: I01414dd83eb6f9a41e56762dd7fc00e7f1115039
Romain Guy [Sat, 12 Jun 2010 01:37:31 +0000 (18:37 -0700)]
Merge "Reduced warnings by removing unused imports, unused variables and adding type arguments"
Jean-Baptiste Queru [Fri, 11 Jun 2010 23:10:46 +0000 (16:10 -0700)]
Merge "Added missing classpathentry for DeskClock App, Bluetooth, obex, Gallery3D, Launcher2, GlobalSearch and Provision"
Jean-Baptiste Queru [Fri, 11 Jun 2010 22:19:42 +0000 (15:19 -0700)]
Merge "Removed unused Imports, Added Type Arguments, removed some Warnings by using unused Methods and Variables"
Xavier Ducrohet [Wed, 9 Jun 2010 17:35:43 +0000 (10:35 -0700)]
am
71027e1b: Provision the backup manager in the SDK System image.
Merge commit '
71027e1b75951c90c22c9979a505381fae843ed3' into froyo-plus-aosp
* commit '
71027e1b75951c90c22c9979a505381fae843ed3':
Provision the backup manager in the SDK System image.
Xavier Ducrohet [Tue, 8 Jun 2010 02:22:29 +0000 (19:22 -0700)]
Provision the backup manager in the SDK System image.
Change-Id: Ib1c9ef22558e71452cf979e36dd1d1fdbf844ce8
The Android Open Source Project [Mon, 7 Jun 2010 23:30:52 +0000 (16:30 -0700)]
merge from open-source master
Change-Id: Ia3b88d1fc8864903dd67478e972758871730a215
Jean-Baptiste Queru [Mon, 7 Jun 2010 21:29:24 +0000 (14:29 -0700)]
Merge "Added Type Arguments to Samples, to reduce Warnings and get a litle bit more Compiler Code checking for "new" Android Programmers"
Dan Egnor [Thu, 3 Jun 2010 21:08:35 +0000 (14:08 -0700)]
am
27626c03: Add API key to BackupRestore sample code.
Merge commit '
27626c03e4db54d1edfaa28f10bef1ef9ded9995' into froyo-plus-aosp
* commit '
27626c03e4db54d1edfaa28f10bef1ef9ded9995':
Add API key to BackupRestore sample code.
Dan Egnor [Thu, 3 Jun 2010 20:38:26 +0000 (13:38 -0700)]
Add API key to BackupRestore sample code.
Change-Id: If80cbceffc213fdc6059fe22bf0e24520fba5f2d
Bug:
2735063
The Android Open Source Project [Wed, 2 Jun 2010 14:45:47 +0000 (07:45 -0700)]
merge from open-source master
Change-Id: If51f538438a5da22d4f04cb6d251603b4abd08f0
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: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: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: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
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: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: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
Christian Mehlmauer [Tue, 25 May 2010 16:34:41 +0000 (18:34 +0200)]
Replaced Deprecated GestureDetector API Call
Change-Id: I36429680b555f834e74ec86c6aa17b696d17d2b6
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
Christian Mehlmauer [Sat, 22 May 2010 19:05:02 +0000 (21:05 +0200)]
Added missing classpathentry for DeskClock App, Bluetooth, obex, Gallery3D, Launcher2, GlobalSearch and Provision
Change-Id: I9754d1049a22e7b677b3537f5c3e9b9f4d239e39
Christian Mehlmauer [Thu, 20 May 2010 18:31:40 +0000 (20:31 +0200)]
Removed unused Imports, Added Type Arguments, removed some Warnings by using unused Methods and Variables
Change-Id: I39a4eb2b17f3411b17fcc49cbbbe396e89fab24a
Christian Mehlmauer [Thu, 20 May 2010 18:11:29 +0000 (20:11 +0200)]
Added Type Arguments to Samples, to reduce Warnings and get a litle bit more Compiler Code checking for "new" Android Programmers
Change-Id: I25add019e99fec88c8422da14f3e18246ca0f0b5
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:14:24 +0000 (21:14 +0200)]
Reduced warnings by removing unused imports, unused variables and adding type arguments
Change-Id: I551403a94de87a2fdf24ac0175ce69b4c8a48d54
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:13:51 +0000 (08:13 -0700)]
merge from open-source master
Change-Id: I4af8f65d1dfff3912f0057645943df78ddefc7ca
Christian Mehlmauer [Tue, 18 May 2010 21:44:32 +0000 (23:44 +0200)]
Corrected StatusBarNotificationSample
Change-Id: I892e84198cfe288e673b81e8ffc331525fee09b8
The Android Open Source Project [Tue, 18 May 2010 17:56:24 +0000 (10:56 -0700)]
merge from open-source master
Change-Id: I5780767c96fbc775ce0dbbcfddb0c2e84bbfaf41
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:27:49 +0000 (09:27 -0700)]
merge from open-source master
Change-Id: I4bbf0fccef174a7f0eb8241b422f846ea21c3349
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: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: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: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: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: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: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:07:55 +0000 (15:07 -0700)]
Merge commit 'goog/readonly-korg-master' into HEAD
Kenny Root [Thu, 6 May 2010 01:06:45 +0000 (18:06 -0700)]
Spelling fix for source download page
Change-Id: I177310b80a2fe632823b6c7b7b63ec11e8e6e829