OSDN Git Service
Mihai Preda [Tue, 2 Mar 2010 14:46:14 +0000 (06:46 -0800)]
Merge "Update Eclipse classpath to reflect arity lib version change."
Dianne Hackborn [Tue, 2 Mar 2010 05:42:38 +0000 (21:42 -0800)]
Pointer location in framework, no longer need to link common.
Raphael [Mon, 1 Mar 2010 23:17:46 +0000 (15:17 -0800)]
Merge "Fix make_windows_sdk."
Raphael [Mon, 1 Mar 2010 19:55:48 +0000 (11:55 -0800)]
Fix make_windows_sdk.
SDK Bug
2478848: emulator fails to build because sdl-config
was not checkout as +x by git/cygwin.
SDK Bug
2479321: aapt built using Cygwin 1.7.x depends on some
new cygwin DLL instead of mgwz.dll. The latter DLL is not even
present and fails to be bundled. This does not change the behavior,
it just makes sure we are using the proper version of cygwin.
Roman Nurik [Mon, 1 Mar 2010 21:03:16 +0000 (13:03 -0800)]
Merge "Add SMS manager demo"
David 'Digit' Turner [Mon, 1 Mar 2010 19:36:30 +0000 (11:36 -0800)]
Merge "Allow the build-toolchain.sh script to apply source packages."
Roman Nurik [Mon, 22 Feb 2010 22:59:11 +0000 (14:59 -0800)]
Add SMS manager demo
Derek Sollenberger [Mon, 1 Mar 2010 15:30:19 +0000 (07:30 -0800)]
am
71ee406e: am
7364d2bc: Add full-screen option to the sample paint plugin.
Merge commit '
71ee406e9b0e42246189804d3174be47a83eb903'
* commit '
71ee406e9b0e42246189804d3174be47a83eb903':
Add full-screen option to the sample paint plugin.
Derek Sollenberger [Mon, 1 Mar 2010 15:15:43 +0000 (07:15 -0800)]
am
7364d2bc: Add full-screen option to the sample paint plugin.
Merge commit '
7364d2bc453a88133c65777b38003f05361135dd' into eclair-mr2-plus-aosp
* commit '
7364d2bc453a88133c65777b38003f05361135dd':
Add full-screen option to the sample paint plugin.
Derek Sollenberger [Mon, 1 Mar 2010 13:18:02 +0000 (08:18 -0500)]
Add full-screen option to the sample paint plugin.
Mihai Preda [Mon, 1 Mar 2010 10:57:51 +0000 (11:57 +0100)]
Update Eclipse classpath to reflect arity lib version change.
Dianne Hackborn [Sat, 27 Feb 2010 01:26:15 +0000 (17:26 -0800)]
Move DeviceAdmin APIs to android.app.admin.
Dan Egnor [Fri, 26 Feb 2010 04:05:10 +0000 (20:05 -0800)]
Merge "Set targetSdkVersion in addition to minSdkVersion (this also needs to be set to a non-default value to install on non-dev builds)."
Xavier Ducrohet [Thu, 25 Feb 2010 19:38:49 +0000 (11:38 -0800)]
Merge "Add the new Ant build rules for library projects. Bug:
2294012"
Dan Egnor [Thu, 25 Feb 2010 19:13:46 +0000 (11:13 -0800)]
Set targetSdkVersion in addition to minSdkVersion (this also needs
to be set to a non-default value to install on non-dev builds).
Also bump the version number once more.
David 'Digit' Turner [Wed, 24 Feb 2010 22:43:10 +0000 (14:43 -0800)]
Allow the build-toolchain.sh script to apply source packages.
All you need to do is place name them like the following:
build/tools/toolchain-patches/<subpath>/<foo>.patch
And they will be applied with 'patch -p1' into:
<build-src>/<subpath>
This is useful to experiment with toolchain changes without having
to regenerate a whole new source package tarball each time.
Dan Egnor [Wed, 24 Feb 2010 18:40:44 +0000 (10:40 -0800)]
Merge "Build against SDK version 4 (Donut) to ensure compatibility"
Dan Egnor [Wed, 24 Feb 2010 05:25:09 +0000 (21:25 -0800)]
Build against SDK version 4 (Donut) to ensure compatibility
Use the correct SDK version and version code parameters in the
manifest (they were in the wrong spot). Bump the version code
to 10 (one greater than what's on bazaar currently).
Derek Sollenberger [Wed, 24 Feb 2010 03:54:11 +0000 (19:54 -0800)]
am
23270e75: am
5b674145: Adding basic on/off screen event handling to the sample background plugin.
Merge commit '
23270e751a8769fba15d5cf41f0d572ea36b948e'
* commit '
23270e751a8769fba15d5cf41f0d572ea36b948e':
Adding basic on/off screen event handling to the sample background plugin.
Derek Sollenberger [Wed, 24 Feb 2010 02:59:30 +0000 (18:59 -0800)]
am
5b674145: Adding basic on/off screen event handling to the sample background plugin.
Merge commit '
5b6741451725eca6774a0030e19daf186d5c102e' into eclair-mr2-plus-aosp
* commit '
5b6741451725eca6774a0030e19daf186d5c102e':
Adding basic on/off screen event handling to the sample background plugin.
Xavier Ducrohet [Fri, 5 Feb 2010 02:42:21 +0000 (18:42 -0800)]
Add the new Ant build rules for library projects.
Bug:
2294012
Change-Id: If4ebfe4d98e0dd445dc7e79dfc096cc761c79f75
Brett Chabot [Tue, 23 Feb 2010 20:28:27 +0000 (12:28 -0800)]
Fix grammar typo in runtest not-annotation help.
Change-Id: I5f5a81d16715f968ed9b265398d2a9e483c23a89
Brett Chabot [Tue, 23 Feb 2010 20:17:47 +0000 (12:17 -0800)]
Merge "Add "annotation" and "not-annotation" args to runtest."
Brett Chabot [Sun, 21 Feb 2010 04:09:58 +0000 (20:09 -0800)]
Add "annotation" and "not-annotation" args to runtest.
Bug
2239240
Change-Id: I49bbee4b74e8b0a51b6e6144818a7e9c08b1b5c2
Derek Sollenberger [Tue, 23 Feb 2010 13:52:16 +0000 (08:52 -0500)]
Adding basic on/off screen event handling to the sample background plugin.
David 'Digit' Turner [Tue, 23 Feb 2010 00:43:26 +0000 (16:43 -0800)]
am
528c8fa1: am
4653cb89: cpufeatures license is BSD, no Apache 2.0
Merge commit '
528c8fa1827b36c19ff92655bb40012415761193'
* commit '
528c8fa1827b36c19ff92655bb40012415761193':
cpufeatures license is BSD, no Apache 2.0
David 'Digit' Turner [Tue, 23 Feb 2010 00:35:29 +0000 (16:35 -0800)]
am
4653cb89: cpufeatures license is BSD, no Apache 2.0
Merge commit '
4653cb897b8f52c1ead12a1bffa1ba40fd8f45a2' into eclair-plus-aosp
* commit '
4653cb897b8f52c1ead12a1bffa1ba40fd8f45a2':
cpufeatures license is BSD, no Apache 2.0
David 'Digit' Turner [Tue, 23 Feb 2010 00:23:24 +0000 (16:23 -0800)]
cpufeatures license is BSD, no Apache 2.0
David 'Digit' Turner [Mon, 22 Feb 2010 23:06:54 +0000 (15:06 -0800)]
am
fda2f438: am
693ad65e: Add missing copyright disclaimers to cpufeatures and hello-neon
Merge commit '
fda2f43891153dbb80cf2d86d1c3a3b632fbed41'
* commit '
fda2f43891153dbb80cf2d86d1c3a3b632fbed41':
Add missing copyright disclaimers to cpufeatures and hello-neon
David 'Digit' Turner [Mon, 22 Feb 2010 22:18:36 +0000 (14:18 -0800)]
am
693ad65e: Add missing copyright disclaimers to cpufeatures and hello-neon
Merge commit '
693ad65e24cefe3d60d3702e6adab13d18b121ba' into eclair-plus-aosp
* commit '
693ad65e24cefe3d60d3702e6adab13d18b121ba':
Add missing copyright disclaimers to cpufeatures and hello-neon
David 'Digit' Turner [Mon, 22 Feb 2010 22:11:07 +0000 (14:11 -0800)]
Add missing copyright disclaimers to cpufeatures and hello-neon
David 'Digit' Turner [Mon, 22 Feb 2010 18:33:24 +0000 (10:33 -0800)]
am
ec0ff012: am
f4efa044: Update hello-gl2 sample to properly implement EGL Config selection.
Merge commit '
ec0ff0125cb33cbae29be268035c461b5a2355ce'
* commit '
ec0ff0125cb33cbae29be268035c461b5a2355ce':
Update hello-gl2 sample to properly implement EGL Config selection.
David 'Digit' Turner [Mon, 22 Feb 2010 18:23:02 +0000 (10:23 -0800)]
am
f4efa044: Update hello-gl2 sample to properly implement EGL Config selection.
Merge commit '
f4efa044a061bf159cd6d7b634371b0cde8cb0b7' into eclair-plus-aosp
* commit '
f4efa044a061bf159cd6d7b634371b0cde8cb0b7':
Update hello-gl2 sample to properly implement EGL Config selection.
Brett Chabot [Mon, 22 Feb 2010 17:44:49 +0000 (09:44 -0800)]
Merge "Fix code coverage definitions for the test-runner tests."
David 'Digit' Turner [Sat, 20 Feb 2010 01:59:50 +0000 (17:59 -0800)]
Update hello-gl2 sample to properly implement EGL Config selection.
Also add some comments to explicit what is being done here.
+ add <uses-feature android:glEsVersion="0x00020000"/> to AndroidManifest.xml
Brett Chabot [Sun, 21 Feb 2010 04:07:38 +0000 (20:07 -0800)]
Fix code coverage definitions for the test-runner tests.
Change-Id: I04aaad10fd116a36e6100fb19b39dc108233022d
Brett Chabot [Sun, 21 Feb 2010 02:34:03 +0000 (18:34 -0800)]
Add new location of test-runner source to Eclipse classpath.
Andy McFadden [Sat, 20 Feb 2010 00:52:49 +0000 (16:52 -0800)]
Merge "Minor improvements to apkcheck."
Andy McFadden [Sat, 20 Feb 2010 00:15:27 +0000 (16:15 -0800)]
Minor improvements to apkcheck.
It turns out annotation classes aren't spelled out in the public API
file, so we now emit warnings instead of errors on unrecognized method
calls into annotation classes.
The <angle bracket> stripper wasn't working quite right, and did the
wrong thing on nested brackets and stuff like "java.lang.Class<?>[]".
Michael Chan [Fri, 19 Feb 2010 23:32:44 +0000 (15:32 -0800)]
Modified to work with Mac. Apparently the | operator doesn't work in sed.
Change-Id: I4d29f7f13e08b8daacc2aeb661774d4ba23ec2d1
Andy McFadden [Fri, 19 Feb 2010 22:40:48 +0000 (14:40 -0800)]
Add --ignore-package option.
Easier but ultimately less useful than generating API XML for stuff.
Andy McFadden [Fri, 19 Feb 2010 20:53:31 +0000 (12:53 -0800)]
Updated README.
Document the trouble cases while I still remember what they are.
Andy McFadden [Fri, 19 Feb 2010 20:01:25 +0000 (12:01 -0800)]
Merge "APK checker."
Marco Nelissen [Fri, 19 Feb 2010 19:00:58 +0000 (11:00 -0800)]
Merge "Add 's' option to grep so it doesn't complain about stuff under .git"
Marco Nelissen [Fri, 19 Feb 2010 18:59:54 +0000 (10:59 -0800)]
Add 's' option to grep so it doesn't complain about stuff under .git
Andy McFadden [Tue, 9 Feb 2010 00:48:01 +0000 (16:48 -0800)]
APK checker.
Compares the fields and methods accessed by an APK against the public
API files generated by the build. See the README for details.
Brett Chabot [Fri, 19 Feb 2010 02:55:11 +0000 (18:55 -0800)]
Add frameworks-testrunner test_defs.
Brett Chabot [Fri, 19 Feb 2010 17:43:00 +0000 (09:43 -0800)]
Merge "Replace runtest --cts option with more generic --suite option."
Brett Chabot [Fri, 19 Feb 2010 04:01:11 +0000 (20:01 -0800)]
Replace runtest --cts option with more generic --suite option.
This will allow you to run a the set of test_defs with attribute suite="foo"
like this:
runtest --suite foo
Bug
2401250
Dianne Hackborn [Wed, 17 Feb 2010 01:48:27 +0000 (17:48 -0800)]
Add new MessengerService API demo.
Also refactor the LocalService demo to be more ammenable to being
used for sample code in the java docs.
Brett Chabot [Wed, 17 Feb 2010 21:22:16 +0000 (13:22 -0800)]
Merge "Add runtest test def for frameworks-core-host."
Brett Chabot [Wed, 17 Feb 2010 19:22:19 +0000 (11:22 -0800)]
Add runtest test def for frameworks-core-host.
Bug
2430400
Dianne Hackborn [Wed, 17 Feb 2010 04:39:53 +0000 (20:39 -0800)]
Fix issue #
2420412: API review: DeviceAdmin API changes
Xavier Ducrohet [Tue, 16 Feb 2010 23:35:57 +0000 (15:35 -0800)]
Add ant.properties to sdk build.
Change-Id: I755e259557cb02d1ca72df0dc18a3bd4fb38d1f1
David 'Digit' Turner [Sat, 13 Feb 2010 01:52:17 +0000 (17:52 -0800)]
am
7ab10f9f: am
92210fe1: Update documentation + simplify make-release.sh script
Merge commit '
7ab10f9ffa522e1831594e75d3e4bf1174d02f1d'
* commit '
7ab10f9ffa522e1831594e75d3e4bf1174d02f1d':
Update documentation + simplify make-release.sh script
David 'Digit' Turner [Sat, 13 Feb 2010 01:44:56 +0000 (17:44 -0800)]
am
142eafac: am
93369c24: Add the \'hello-neon\' sample app to demonstrate cpufeatures and ARM Neon usage.
Merge commit '
142eafac97d8aae9d05532d19a80494a1593d2e8'
* commit '
142eafac97d8aae9d05532d19a80494a1593d2e8':
Add the 'hello-neon' sample app to demonstrate cpufeatures and ARM Neon usage.
David 'Digit' Turner [Sat, 13 Feb 2010 01:44:11 +0000 (17:44 -0800)]
am
92210fe1: Update documentation + simplify make-release.sh script
Merge commit '
92210fe14b79481c2f087e24ed6e7a2627cc80f3' into eclair-plus-aosp
* commit '
92210fe14b79481c2f087e24ed6e7a2627cc80f3':
Update documentation + simplify make-release.sh script
David 'Digit' Turner [Sat, 13 Feb 2010 01:31:15 +0000 (17:31 -0800)]
am
93369c24: Add the \'hello-neon\' sample app to demonstrate cpufeatures and ARM Neon usage.
Merge commit '
93369c247069b116f39c30530287809f5a190c22' into eclair-plus-aosp
* commit '
93369c247069b116f39c30530287809f5a190c22':
Add the 'hello-neon' sample app to demonstrate cpufeatures and ARM Neon usage.
David 'Digit' Turner [Sat, 13 Feb 2010 01:23:21 +0000 (17:23 -0800)]
Update documentation + simplify make-release.sh script
David 'Digit' Turner [Fri, 12 Feb 2010 23:51:33 +0000 (15:51 -0800)]
Add the 'hello-neon' sample app to demonstrate cpufeatures and ARM Neon usage.
+ Add a small cleanup script (build/tools/cleanup-apps.sh)
+ Minor formatting of hello-gl2 sample.
Mike LeBeau [Fri, 12 Feb 2010 22:30:00 +0000 (14:30 -0800)]
Elaborate on html docs for VoiceRecognitionService a little bit.
Mike LeBeau [Fri, 12 Feb 2010 22:08:46 +0000 (14:08 -0800)]
Add VoiceRecognitionService to the list of SDK sample apps.
Dianne Hackborn [Fri, 12 Feb 2010 21:55:27 +0000 (13:55 -0800)]
Merge "New dev tools option for window manager pointer location."
Mike LeBeau [Fri, 12 Feb 2010 21:55:09 +0000 (13:55 -0800)]
Merge "First stab at a sample voice recognition service to show the skeleton for how to set up such a thing and expose its settings activity, etc."
Dianne Hackborn [Fri, 12 Feb 2010 06:21:43 +0000 (22:21 -0800)]
New dev tools option for window manager pointer location.
Mike LeBeau [Fri, 12 Feb 2010 06:58:29 +0000 (22:58 -0800)]
First stab at a sample voice recognition service to show the skeleton for how
to set up such a thing and expose its settings activity, etc.
Raphael Moll [Thu, 11 Feb 2010 22:47:59 +0000 (14:47 -0800)]
Merge "Update prebuilt Groovy JAR to 1.7.0"
Dianne Hackborn [Thu, 11 Feb 2010 22:27:36 +0000 (14:27 -0800)]
Removed limit-unlock policy.
Raphael [Thu, 11 Feb 2010 22:30:02 +0000 (14:30 -0800)]
Update prebuilt Groovy JAR to 1.7.0
Depends on Change Ie2684212
Change-Id: I9eb6eabd99dcaf36d7c0432e0a08b1c9b1fa49c3
David Turner [Thu, 11 Feb 2010 20:19:30 +0000 (12:19 -0800)]
am
e3af8ae5: am
e6aa4229: Merge "Add NEON support to the NDK build system + docs" into eclair
Merge commit '
e3af8ae5211eb3b544e79634420964110d3f5340'
* commit '
e3af8ae5211eb3b544e79634420964110d3f5340':
Add NEON support to the NDK build system + docs
Debajit Ghosh [Thu, 11 Feb 2010 19:16:35 +0000 (11:16 -0800)]
Merge "add preview functionality to the bug report sender. lets users preview system logs, memory info, cpu info, and procrank."
David Turner [Thu, 11 Feb 2010 19:02:09 +0000 (11:02 -0800)]
am
e6aa4229: Merge "Add NEON support to the NDK build system + docs" into eclair
Merge commit '
e6aa4229876baadfc16fedca1e4b2ec068508974' into eclair-plus-aosp
* commit '
e6aa4229876baadfc16fedca1e4b2ec068508974':
Add NEON support to the NDK build system + docs
David Turner [Thu, 11 Feb 2010 18:56:24 +0000 (10:56 -0800)]
Merge "Add NEON support to the NDK build system + docs" into eclair
Nicolas Catania [Thu, 11 Feb 2010 06:40:39 +0000 (22:40 -0800)]
Added gtest to the list. cd to /sdcard before running native tests.
Some test need to be run in a place where they can write on the disk.
I know we should stop using /sdcard but until I see the new document
explaining how the launcher can access the playground, we are going
to keep it that way.
Debajit Ghosh [Tue, 9 Feb 2010 08:17:42 +0000 (00:17 -0800)]
add preview functionality to the bug report sender. lets users preview system logs, memory info, cpu info, and procrank.
James Yum [Wed, 10 Feb 2010 21:05:40 +0000 (13:05 -0800)]
James Yum [Wed, 10 Feb 2010 21:01:55 +0000 (13:01 -0800)]
James Yum [Wed, 10 Feb 2010 19:18:23 +0000 (11:18 -0800)]
cleanup
deleted: licensing/ILicenseResultListener.aidl
deleted: licensing/ILicensingService.aidl
deleted: licensing/LicenseChecker.java
deleted: licensing/LicenseCheckerCallback.java
deleted: licensing/LicenseValidator.java
deleted: licensing/Policy.java
deleted: licensing/ResponseData.java
deleted: licensing/StrictPolicy.java
Dirk Dougherty [Wed, 10 Feb 2010 02:47:09 +0000 (18:47 -0800)]
am
2a589050: am
4389d65c: Merge "Add SampleSyncAdapter to SDK build and docs build. Add CubeLiveWallpaper to docs build." into eclair
Merge commit '
2a589050efc7947cc75d3cfe6b12f1eeb2f5ea3a'
* commit '
2a589050efc7947cc75d3cfe6b12f1eeb2f5ea3a':
Add SampleSyncAdapter to SDK build and docs build. Add CubeLiveWallpaper to docs build.
Dirk Dougherty [Wed, 10 Feb 2010 02:42:38 +0000 (18:42 -0800)]
am
4389d65c: Merge "Add SampleSyncAdapter to SDK build and docs build. Add CubeLiveWallpaper to docs build." into eclair
Merge commit '
4389d65caea762b276b1b7d6fd560f4b2c4370b3' into eclair-plus-aosp
* commit '
4389d65caea762b276b1b7d6fd560f4b2c4370b3':
Add SampleSyncAdapter to SDK build and docs build. Add CubeLiveWallpaper to docs build.
Dirk Dougherty [Wed, 10 Feb 2010 02:36:48 +0000 (18:36 -0800)]
Merge "Add SampleSyncAdapter to SDK build and docs build. Add CubeLiveWallpaper to docs build." into eclair
Dirk Dougherty [Mon, 8 Feb 2010 18:22:43 +0000 (10:22 -0800)]
Add SampleSyncAdapter to SDK build and docs build. Add CubeLiveWallpaper to docs build.
Change-Id: I149fb2aab91d0a2dfc4242a85118bf20dea97e42
David 'Digit' Turner [Tue, 9 Feb 2010 20:25:56 +0000 (12:25 -0800)]
Add NEON support to the NDK build system + docs
You can now define LOCAL_ARM_NEON to 'true' in your Android.mk
to indicate that a whole module must be compiled with NEON support.
Alternatively, use the .neon suffix when listing source files in
LOCAL_SRC_FILES to indicate that they should be built with NEON
support. E.g.:
LOCAL_SRC_FILES := foo.c.neon bar.c zoo.c.arm.neon
Note that .arm.neon is supported, but .neon.arm is NOT.
Also added documentation in docs/CPU-ARM-NEON.TXT
Another patch will provide one or more sample applications
to demonstrate all of this.
Dianne Hackborn [Tue, 9 Feb 2010 06:41:08 +0000 (22:41 -0800)]
New sample code for new external storage paths/APIs.
Andrew Stadler [Tue, 9 Feb 2010 05:00:05 +0000 (21:00 -0800)]
Cleanups to Device Admin sample code
1. Rename SampleDeviceAdmin to DeviceAdminSample where it appears in
filenames. This makes it easier to find when scanning directories.
2. Fix bug in max password length handling
3. Add a toast to warn user that entering values in "Password Attempts"
box has real consequences.
Cedric Beust [Mon, 8 Feb 2010 20:49:49 +0000 (12:49 -0800)]
Updated .classpath.
David Turner [Mon, 8 Feb 2010 20:58:38 +0000 (12:58 -0800)]
am
e52f44d9: am
3b712fda: Merge "Add \'cpufeatures\' library to perform runtime CPU family/features detection." into eclair
Merge commit '
e52f44d9506b56e610f81eecc4f6aaca390f7a8d'
* commit '
e52f44d9506b56e610f81eecc4f6aaca390f7a8d':
Add 'cpufeatures' library to perform runtime CPU family/features detection.
David Turner [Mon, 8 Feb 2010 20:52:35 +0000 (12:52 -0800)]
am
3b712fda: Merge "Add \'cpufeatures\' library to perform runtime CPU family/features detection." into eclair
Merge commit '
3b712fda34a3d7a71e6a4ba6ee495b178b2c1830' into eclair-plus-aosp
* commit '
3b712fda34a3d7a71e6a4ba6ee495b178b2c1830':
Add 'cpufeatures' library to perform runtime CPU family/features detection.
David Turner [Mon, 8 Feb 2010 20:35:21 +0000 (12:35 -0800)]
Merge "Add 'cpufeatures' library to perform runtime CPU family/features detection." into eclair
Bryan Mawhinney [Fri, 5 Feb 2010 17:17:13 +0000 (17:17 +0000)]
Update test configs to replace GlobalSearch with QuickSearchBox
The Android Open Source Project [Sat, 6 Feb 2010 02:00:05 +0000 (18:00 -0800)]
am
60932954: merge from open-source master
Merge commit '
609329541ac4c23a2a21b7d493c594c1b3d0c438'
* commit '
609329541ac4c23a2a21b7d493c594c1b3d0c438':
Add uses-feature for live wallpaper sample.
resolves Issue #5280: Go to problem in source from LogCat
Jeff Hamilton [Sat, 6 Feb 2010 00:29:39 +0000 (18:29 -0600)]
Remove reference to unused static library.
Change-Id: I46237ccd501706e13de2fad8335c09f02306e98b
David 'Digit' Turner [Fri, 5 Feb 2010 22:29:11 +0000 (14:29 -0800)]
Add 'cpufeatures' library to perform runtime CPU family/features detection.
It is provided as a static library that NDK developers can link against.
The code is designed to run on all official Android platforms, starting
from Android 1.5.
The Android Open Source Project [Fri, 5 Feb 2010 22:09:11 +0000 (14:09 -0800)]
am
f06e372c: am
c13fbca9: reconcile main tree with open-source eclair
Merge commit '
f06e372cf9be356721abfc32ff2752e452dcebbd'
* commit '
f06e372cf9be356721abfc32ff2752e452dcebbd':
Add uses-feature for live wallpaper sample.
android-2.1_r1 snapshot
The Android Open Source Project [Fri, 5 Feb 2010 21:51:37 +0000 (13:51 -0800)]
merge from open-source master
Ficus Kirkpatrick [Fri, 5 Feb 2010 03:21:07 +0000 (19:21 -0800)]
Remove some unused cruft from Eclipse classpath.
Change-Id: Ic4eeb819e01c02398aa3b7b76c9109511bd34725
The Android Open Source Project [Fri, 5 Feb 2010 16:23:01 +0000 (08:23 -0800)]
am
c13fbca9: reconcile main tree with open-source eclair
Merge commit '
c13fbca985b333cfb09d2b29875b36594dd44d64' into eclair-plus-aosp
* commit '
c13fbca985b333cfb09d2b29875b36594dd44d64':
Add uses-feature for live wallpaper sample.
android-2.1_r1 snapshot
The Android Open Source Project [Fri, 5 Feb 2010 16:09:32 +0000 (08:09 -0800)]
reconcile main tree with open-source eclair
Andy Stadler [Thu, 4 Feb 2010 23:32:39 +0000 (15:32 -0800)]
Merge "Add QuickSearchBox intermediates, to get EventLogTags"
Andrew Stadler [Thu, 4 Feb 2010 23:13:42 +0000 (15:13 -0800)]
Add QuickSearchBox intermediates, to get EventLogTags