OSDN Git Service
Android (Google) Code Review [Thu, 23 Apr 2009 18:49:30 +0000 (11:49 -0700)]
Merge change 488 into donut
* changes:
add -n option to turn off prereq check when build OTA packages
Doug Zongker [Thu, 23 Apr 2009 18:41:58 +0000 (11:41 -0700)]
add -n option to turn off prereq check when build OTA packages
Developers might legitimately want to install older builds on their
phones, so add option to build OTA packages that will install over
newer builds.
Jean-Baptiste Queru [Thu, 23 Apr 2009 00:56:50 +0000 (17:56 -0700)]
merge cupcake into donut
Dirk Dougherty [Wed, 22 Apr 2009 20:20:39 +0000 (13:20 -0700)]
Merge branch 'readonly-p4-donut' into donut
Dirk Dougherty [Wed, 22 Apr 2009 20:19:29 +0000 (13:19 -0700)]
AI 147303: am: CL 147297 Update Android 1.5 SDK Download, Release Notes, Version Notes, Highlights
Please let me know if you have other "known issues", "resolved issues", or
"highlights".
Also, note that the installing and upgrading docs are being updated in
a different CL, so the new version is not displayed on my staging server.
Original author: ddougherty
Merged from: //branches/cupcake/...
Automated import of CL 147303
Phil Dubach [Wed, 22 Apr 2009 18:56:14 +0000 (11:56 -0700)]
AI 147397: CTS: Fix VM test description generator
Automated import of CL 147397
Dirk Dougherty [Wed, 22 Apr 2009 01:52:37 +0000 (18:52 -0700)]
AI 147297: Update Android 1.5 SDK Download, Release Notes, Version Notes, Highlights
Please let me know if you have other "known issues", "resolved issues", or
"highlights".
Also, note that the installing and upgrading docs are being updated in
a different CL, so the new version is not displayed on my staging server.
BUG=
1790234
Automated import of CL 147297
Doug Zongker [Wed, 22 Apr 2009 00:12:54 +0000 (17:12 -0700)]
add -w option to ota_from_target_files
Add option to make OTA packages that wipe user data.
Android (Google) Code Review [Tue, 21 Apr 2009 23:06:17 +0000 (16:06 -0700)]
Merge change 362 into donut
* changes:
generalize -t option to add and remove tags in fingerprints
Doug Zongker [Tue, 21 Apr 2009 17:04:51 +0000 (10:04 -0700)]
generalize -t option to add and remove tags in fingerprints
To support devphone and holiday builds we need more control over the
build fingerprint tags; generalize the -t option so we can arbitrarily
add and remove tags.
Xavier Ducrohet [Tue, 21 Apr 2009 20:36:38 +0000 (13:36 -0700)]
Merge branch 'readonly-p4-donut' into donut
Xavier Ducrohet [Tue, 21 Apr 2009 20:35:21 +0000 (13:35 -0700)]
AI 147198: am: CL 147197 Adds calculator to sdk build.
Original author: xav
Merged from: //branches/cupcake/...
Automated import of CL 147198
Xavier Ducrohet [Tue, 21 Apr 2009 20:35:03 +0000 (13:35 -0700)]
AI 147197: Adds calculator to sdk build.
BUG=
1803455
Automated import of CL 147197
Dirk Dougherty [Tue, 21 Apr 2009 08:01:23 +0000 (01:01 -0700)]
Merge branch 'readonly-p4-donut' into donut
Dirk Dougherty [Tue, 21 Apr 2009 08:00:11 +0000 (01:00 -0700)]
AI 147054: am: CL 147053 Add -hdf primer vars for the platform and release ID associated with the current (most recent) SDK.
Currently, the docs that are specific to each SDK release -- downloading, installing, upgrading, requirements -- are stored in a directory with release-derived name, such as "1.1_r1". This change lets documents use generic links to point into the most recent version specific docs, eg href="{@docRoot}sdk/{sdkCurrent}/installing.html" instead of href="{@docRoot}sdk/1.1_r1/installing.html".
Original author: ddougherty
Merged from: //branches/cupcake/...
Automated import of CL 147054
Dirk Dougherty [Tue, 21 Apr 2009 00:54:49 +0000 (17:54 -0700)]
AI 147053: Add -hdf primer vars for the platform and release ID associated with the current (most recent) SDK.
Currently, the docs that are specific to each SDK release -- downloading, installing, upgrading, requirements -- are stored in a directory with release-derived name, such as "1.1_r1". This change lets documents use generic links to point into the most recent version specific docs, eg href="{@docRoot}sdk/{sdkCurrent}/installing.html" instead of href="{@docRoot}sdk/1.1_r1/installing.html".
BUG=
1790234
Automated import of CL 147053
Android (Google) Code Review [Mon, 20 Apr 2009 19:11:35 +0000 (12:11 -0700)]
Merge change 268 into donut
* changes:
add option to modify build fingerprint tags when signing
Scott Main [Mon, 20 Apr 2009 18:17:51 +0000 (11:17 -0700)]
Merge branch 'readonly-p4-donut' into donut
Scott Main [Mon, 20 Apr 2009 18:16:42 +0000 (11:16 -0700)]
AI 146953: am: CL 146951 CSS edits for docs;
remove preliminary watermark;
remove red color text for warnings;
delete the caution class;
use 1em top-margin only for elements nested in a DD, elements nested in regular
LIs should only be a half em.
Original author: smain
Merged from: //branches/cupcake/...
Automated import of CL 146953
Scott Main [Mon, 20 Apr 2009 18:15:26 +0000 (11:15 -0700)]
AI 146951: CSS edits for docs;
remove preliminary watermark;
remove red color text for warnings;
delete the caution class;
use 1em top-margin only for elements nested in a DD, elements nested in regular
LIs should only be a half em.
BUG=
1798190
Automated import of CL 146951
Urs Grob [Fri, 17 Apr 2009 18:28:20 +0000 (11:28 -0700)]
Merge branch 'readonly-p4-donut' into donut
Urs Grob [Fri, 17 Apr 2009 18:27:08 +0000 (11:27 -0700)]
AI 146742: am: CL 146710 Splitting android.core.tests.apk into several smaller
apks. Each libcore module gets one apk and luni gets 4.
Original author: ursg
Merged from: //branches/cupcake/...
Automated import of CL 146742
Joe Onorato [Fri, 17 Apr 2009 18:16:46 +0000 (11:16 -0700)]
Merge branch 'readonly-p4-donut' into donut
Joe Onorato [Fri, 17 Apr 2009 18:15:32 +0000 (11:15 -0700)]
AI 146738: am: CL 146687 The maps and gtalkservice libraries were still being included in
all of the builds. Fix that.
We really need to get this generic_with_google product out of
build/target and into vendor/google, but that can come later.
Original author: joeo
Merged from: //branches/cupcake/...
Automated import of CL 146738
Doug Zongker [Fri, 17 Apr 2009 17:15:58 +0000 (10:15 -0700)]
add option to modify build fingerprint tags when signing
Adds the -t option to sign_target_files_apks, which lets the user
specify extra tags that should be added to the build fingerprint
during the signing process.
Urs Grob [Fri, 17 Apr 2009 09:07:14 +0000 (02:07 -0700)]
AI 146710: Splitting android.core.tests.apk into several smaller
apks. Each libcore module gets one apk and luni gets 4.
BUG=
1789657
Automated import of CL 146710
Joe Onorato [Fri, 17 Apr 2009 02:15:49 +0000 (19:15 -0700)]
AI 146687: The maps and gtalkservice libraries were still being included in
all of the builds. Fix that.
We really need to get this generic_with_google product out of
build/target and into vendor/google, but that can come later.
BUG=
1786404
Automated import of CL 146687
Doug Zongker [Thu, 16 Apr 2009 17:16:38 +0000 (10:16 -0700)]
add check mode to zipalign
Add a -c flag to zipalign to do nothing but check the input zip file
for alignment (with or without verbosity).
Dirk Dougherty [Wed, 15 Apr 2009 18:41:27 +0000 (11:41 -0700)]
Merge branch 'readonly-p4-donut' into donut
Dirk Dougherty [Wed, 15 Apr 2009 18:40:10 +0000 (11:40 -0700)]
AI 146347: am: CL 146344 g4 integrate -t -i -b platform-1_0-to-cupcake @143529,143529 (doc change)
Original author: ddougherty
Merged from: //branches/cupcake/...
Automated import of CL 146347
Dirk Dougherty [Wed, 15 Apr 2009 18:37:52 +0000 (11:37 -0700)]
Merge branch 'readonly-p4-donut' into donut
Dirk Dougherty [Wed, 15 Apr 2009 18:36:34 +0000 (11:36 -0700)]
AI 146346: am: CL 146342 g4 integrate -t -i -b platform-1_0-to-cupcake @141805,141805 (doc change)
Original author: ddougherty
Merged from: //branches/cupcake/...
Automated import of CL 146346
Dirk Dougherty [Wed, 15 Apr 2009 18:32:45 +0000 (11:32 -0700)]
AI 146344: g4 integrate -t -i -b platform-1_0-to-cupcake @143529,143529 (doc change)
BUG=
1675368
Automated import of CL 146344
Dirk Dougherty [Wed, 15 Apr 2009 18:31:36 +0000 (11:31 -0700)]
AI 146342: g4 integrate -t -i -b platform-1_0-to-cupcake @141805,141805 (doc change)
BUG=
1675368
Automated import of CL 146342
Doug Zongker [Tue, 14 Apr 2009 21:05:15 +0000 (14:05 -0700)]
make unsigned apks explicit
Allow user to explicitly specify that an apk is not to be
re-signed. Fail if we have any apks that for which no key is provided.
Doug Zongker [Tue, 14 Apr 2009 19:35:46 +0000 (12:35 -0700)]
Merge branch 'readonly-p4-donut' into donut
Doug Zongker [Tue, 14 Apr 2009 19:34:27 +0000 (12:34 -0700)]
AI 146194: am: CL 146193 Fix signing script so keys specified in -e options get passed
through the key map. Clarify the help for the -e option to
make clear this should happen.
(This change doesn't affect device code.)
Original author: dougz
Merged from: //branches/cupcake/...
Automated import of CL 146194
Doug Zongker [Tue, 14 Apr 2009 19:33:31 +0000 (12:33 -0700)]
AI 146193: Fix signing script so keys specified in -e options get passed
through the key map. Clarify the help for the -e option to
make clear this should happen.
(This change doesn't affect device code.)
Automated import of CL 146193
Raphael Moll [Tue, 14 Apr 2009 01:22:26 +0000 (18:22 -0700)]
Merge branch 'readonly-p4-donut' into donut
Raphael Moll [Tue, 14 Apr 2009 01:21:16 +0000 (18:21 -0700)]
AI 145983: am: CL 145911 ADT #
1778786: tool to generate stubbed jar file.
This is only a preliminary CL. More will follow but this is
a good start, with the following caveats:
What it does:
- take an input jar, a list of includes, a list of excludes.
- generate actual Java source for the filtered classes.
What it doesn't do yet:
- some more work on filtering inner elements (methods, etc.)
- properly generate inner classes.
- hide synthetic fields.
- some classes body are missing
- directly generate a stubbed bytecode/jar rather than source.
I'll likely want to keep the source generator for debugging
purposes or if we want to integrate with a build system instead.
- classpath will be changed in the final CL to refer to the external
ASM lib rather than the project. I need the source for debugging
rigth now.
- will review comments before submitting.
Original author: raphael
Merged from: //branches/cupcake/...
Automated import of CL 145983
Raphael Moll [Mon, 13 Apr 2009 19:53:33 +0000 (12:53 -0700)]
AI 145911: ADT #
1778786: tool to generate stubbed jar file.
This is only a preliminary CL. More will follow but this is
a good start, with the following caveats:
What it does:
- take an input jar, a list of includes, a list of excludes.
- generate actual Java source for the filtered classes.
What it doesn't do yet:
- some more work on filtering inner elements (methods, etc.)
- properly generate inner classes.
- hide synthetic fields.
- some classes body are missing
- directly generate a stubbed bytecode/jar rather than source.
I'll likely want to keep the source generator for debugging
purposes or if we want to integrate with a build system instead.
- classpath will be changed in the final CL to refer to the external
ASM lib rather than the project. I need the source for debugging
rigth now.
- will review comments before submitting.
BUG=
1778786
Automated import of CL 145911
Joe Onorato [Mon, 13 Apr 2009 15:32:27 +0000 (08:32 -0700)]
Merge branch 'readonly-p4-donut' into donut
Joe Onorato [Mon, 13 Apr 2009 15:31:16 +0000 (08:31 -0700)]
AI 145850: am: CL 145512 SDK add-on updates
- rename the directory and zip file
- make it build to the dist directory
Original author: joeo
Merged from: //branches/cupcake/...
Automated import of CL 145850
Jack Veenstra [Fri, 10 Apr 2009 18:23:09 +0000 (11:23 -0700)]
AI 145720: Fixed tracedmdump() by correcting the KERNEL path.
Merged 145709 from donut.
BUG=
1630077
Automated import of CL 145720
Jack Veenstra [Fri, 10 Apr 2009 17:32:11 +0000 (10:32 -0700)]
Merge branch 'readonly-p4-donut' into donut
Jack Veenstra [Fri, 10 Apr 2009 17:30:51 +0000 (10:30 -0700)]
AI 145709: Fixed tracedmdump() by correcting the KERNEL path.
Merged 145592 from master.
BUG=
1630077
Automated import of CL 145709
Mike Lockwood [Fri, 10 Apr 2009 13:36:10 +0000 (06:36 -0700)]
Merge branch 'readonly-p4-donut' into donut
Mike Lockwood [Fri, 10 Apr 2009 13:34:59 +0000 (06:34 -0700)]
AI 145704: Manually integrate change 145576 to donutburger to fix "lunch"
Automated import of CL 145704
Xavier Ducrohet [Fri, 10 Apr 2009 02:43:23 +0000 (19:43 -0700)]
Merge branch 'readonly-p4-donut' into donut
Xavier Ducrohet [Fri, 10 Apr 2009 02:42:09 +0000 (19:42 -0700)]
AI 145622: am: CL 145380 Fixes for add-on build
Original author: xav
Merged from: //branches/cupcake/...
Automated import of CL 145622
Joe Onorato [Fri, 10 Apr 2009 02:40:30 +0000 (19:40 -0700)]
Merge branch 'readonly-p4-donut' into donut
Joe Onorato [Fri, 10 Apr 2009 02:39:15 +0000 (19:39 -0700)]
AI 145621: am: CL 145373 remove a debugging printf that sometimes breaks the build
because the commandline is too long
Original author: joeo
Merged from: //branches/cupcake/...
Automated import of CL 145621
Joe Onorato [Fri, 10 Apr 2009 02:32:25 +0000 (19:32 -0700)]
Merge branch 'readonly-p4-donut' into donut
Joe Onorato [Fri, 10 Apr 2009 02:31:12 +0000 (19:31 -0700)]
AI 145618: am: CL 145333 Cloned from CL 144759 by 'g4 patch'.
Original change by joeo@abreu on 2009/04/06 19:54:13.
Implement SDK add-ons in the build system.
- Add an option to use the standard javadoc doclet instead
of droiddoc, since droiddocs non-sdk templates aren't
ready for prime time.
- Add the notion of a stubs for a library. It's only
implemented for java libraries, but when we do native
libraries in the NDK or sdk-addons, it will work there too.
Original author: joeo
Merged from: //branches/cupcake/...
Automated import of CL 145618
Dave Bort [Fri, 10 Apr 2009 00:20:55 +0000 (17:20 -0700)]
AI 145576: Probe for the proper sed(1) extended regex switch
Automated import of CL 145576
Joe Onorato [Thu, 9 Apr 2009 21:20:30 +0000 (14:20 -0700)]
AI 145512: SDK add-on updates
- rename the directory and zip file
- make it build to the dist directory
Automated import of CL 145512
Xavier Ducrohet [Thu, 9 Apr 2009 21:08:25 +0000 (14:08 -0700)]
Merge branch 'readonly-p4-donut' into donut
Xavier Ducrohet [Thu, 9 Apr 2009 21:07:07 +0000 (14:07 -0700)]
AI 145464: am: CL 145080 Add Latin and Chinese method to SDK.
Original author: xav
Merged from: //branches/cupcake/...
Automated import of CL 145464
Xavier Ducrohet [Thu, 9 Apr 2009 19:21:52 +0000 (12:21 -0700)]
AI 145380: Fixes for add-on build
Automated import of CL 145380
Joe Onorato [Thu, 9 Apr 2009 19:05:55 +0000 (12:05 -0700)]
AI 145373: remove a debugging printf that sometimes breaks the build
because the commandline is too long
Automated import of CL 145373
Joe Onorato [Thu, 9 Apr 2009 17:17:32 +0000 (10:17 -0700)]
AI 145333: Cloned from CL 144759 by 'g4 patch'.
Original change by joeo@abreu on 2009/04/06 19:54:13.
Implement SDK add-ons in the build system.
- Add an option to use the standard javadoc doclet instead
of droiddoc, since droiddocs non-sdk templates aren't
ready for prime time.
- Add the notion of a stubs for a library. It's only
implemented for java libraries, but when we do native
libraries in the NDK or sdk-addons, it will work there too.
Automated import of CL 145333
Xavier Ducrohet [Wed, 8 Apr 2009 19:13:43 +0000 (12:13 -0700)]
AI 145080: Add Latin and Chinese method to SDK.
Automated import of CL 145080
Xavier Ducrohet [Tue, 7 Apr 2009 03:31:11 +0000 (20:31 -0700)]
Merge branch 'readonly-p4-donut' into donut
Xavier Ducrohet [Tue, 7 Apr 2009 03:30:02 +0000 (20:30 -0700)]
AI 144765: am: CL 144764 Fix the SDK build to properly package what needs to go in the system image (bug #
1761105)
Original author: xav
Merged from: //branches/cupcake/...
Automated import of CL 144765
Xavier Ducrohet [Tue, 7 Apr 2009 03:29:27 +0000 (20:29 -0700)]
AI 144764: Fix the SDK build to properly package what needs to go in the system image (bug #
1761105)
BUG=
1761105
Automated import of CL 144764
Doug Zongker [Mon, 6 Apr 2009 22:21:45 +0000 (15:21 -0700)]
update the cert used for OTA verification when signing
The build system now (in donut) produces builds that use the testkey
cert for OTA package verification. Change the app-signing script to
also optionally substitute the "real" cert in both the recovery and
system images. Also fix bug where the build fingerprint and
description were not getting properly updated in the recovery
partition.
Doug Zongker [Thu, 2 Apr 2009 19:14:19 +0000 (12:14 -0700)]
AI 144270: am: CL 144269 Relocate the new (google-indepedent) tools for signing and
building images & OTA packages out of vendor/google.
No device code is touched by this change.
Original author: dougz
Merged from: //branches/cupcake/...
Automated import of CL 144270
Doug Zongker [Thu, 2 Apr 2009 19:10:46 +0000 (12:10 -0700)]
AI 144269: Relocate the new (google-indepedent) tools for signing and
building images & OTA packages out of vendor/google.
No device code is touched by this change.
BUG=
1753409
Automated import of CL 144269
Andy Stadler [Thu, 2 Apr 2009 18:34:10 +0000 (11:34 -0700)]
AI 144253: Cleanstep for gsm related errors.
Automated import of CL 144253
Mike Ritter [Thu, 2 Apr 2009 08:26:29 +0000 (01:26 -0700)]
AI 144166: am: CL 144164 Adding droiddocs/javadocs usage to Pdk-docs to get correct style.
Original author: mritter
Merged from: //branches/cupcake/...
Automated import of CL 144166
Doug Zongker [Thu, 2 Apr 2009 08:15:57 +0000 (01:15 -0700)]
AI 144143: Define OTA_PUBLIC_KEYS to be the test keys in the otapackage
target as well.
Automated import of CL 144143
Mike Ritter [Thu, 2 Apr 2009 00:30:12 +0000 (17:30 -0700)]
AI 144164: Adding droiddocs/javadocs usage to Pdk-docs to get correct style.
BUG=
1646802
Automated import of CL 144164
Doug Zongker [Wed, 1 Apr 2009 22:48:46 +0000 (15:48 -0700)]
AI 144130: Don't build OTA package keys into the recovery binary; read
them from an external file in the recovery image. Use the
test-keys for all builds.
Automated import of CL 144130
Raphael Moll [Wed, 1 Apr 2009 00:19:14 +0000 (17:19 -0700)]
AI 143879: am: CL 143876 Include hprof-conv in SDK (bug #
1640225)
Original author: raphael
Merged from: //branches/cupcake/...
Automated import of CL 143879
Raphael Moll [Wed, 1 Apr 2009 00:16:45 +0000 (17:16 -0700)]
AI 143876: Include hprof-conv in SDK (bug #
1640225)
BUG=
1640225
Automated import of CL 143876
Brett Chabot [Tue, 31 Mar 2009 21:53:34 +0000 (14:53 -0700)]
AI 143784: am: CL 143737 Fix kernel build: remove the '.' from runtest.py shortcut
Original author: brettchabot
Merged from: //branches/cupcake/...
Automated import of CL 143784
Brett Chabot [Tue, 31 Mar 2009 18:36:05 +0000 (11:36 -0700)]
AI 143737: Fix kernel build: remove the '.' from runtest.py shortcut
Automated import of CL 143737
Brett Chabot [Sat, 28 Mar 2009 03:17:02 +0000 (20:17 -0700)]
AI 143263: am: CL 143102 Add build environment shortcut to runtest.py.
This change does not affect device code.
Original author: brettchabot
Merged from: //branches/cupcake/...
Automated import of CL 143263
Brett Chabot [Fri, 27 Mar 2009 17:25:11 +0000 (10:25 -0700)]
AI 143102: Add build environment shortcut to runtest.py.
This change does not affect device code.
BUG=
1741172
Automated import of CL 143102
Eric Fischer [Thu, 26 Mar 2009 00:01:21 +0000 (17:01 -0700)]
Automated import from //branches/donutburger/...@142719,142719
Andy Stadler [Wed, 25 Mar 2009 23:05:01 +0000 (16:05 -0700)]
Automated import from //branches/donutburger/...@142699,142699
Eric Fischer [Wed, 25 Mar 2009 22:21:11 +0000 (15:21 -0700)]
Automated import from //branches/cupcake/...@142639,142639
Andy Stadler [Wed, 25 Mar 2009 17:06:48 +0000 (10:06 -0700)]
Automated import from //branches/cupcake/...@142563,142563
Sriram Raman [Wed, 25 Mar 2009 05:40:59 +0000 (22:40 -0700)]
Automated import from //branches/donutburger/...@142410,142410
Dave Bort [Wed, 25 Mar 2009 03:50:42 +0000 (20:50 -0700)]
Automated import from //branches/donutburger/...@141759,141759
Dima Zavin [Wed, 25 Mar 2009 03:31:33 +0000 (20:31 -0700)]
Automated import from //branches/donutburger/...@141546,141546
Iliyan Malchev [Wed, 25 Mar 2009 02:58:48 +0000 (19:58 -0700)]
Automated import from //branches/donutburger/...@141285,141285
Sriram Raman [Wed, 25 Mar 2009 02:39:09 +0000 (19:39 -0700)]
Automated import from //branches/cupcake/...@142409,142409
Dave Sparks [Wed, 25 Mar 2009 02:14:21 +0000 (19:14 -0700)]
Automated import from //branches/donutburger/...@141015,141015
Joe Onorato [Wed, 25 Mar 2009 02:07:34 +0000 (19:07 -0700)]
Automated import from //branches/donutburger/...@140982,140982
Dianne Hackborn [Wed, 25 Mar 2009 01:36:43 +0000 (18:36 -0700)]
Automated import from //branches/donutburger/...@140818,140818
Sriram Raman [Wed, 25 Mar 2009 01:07:52 +0000 (18:07 -0700)]
Automated import from //branches/cupcake/...@141670,141670
Sriram Raman [Wed, 25 Mar 2009 01:07:02 +0000 (18:07 -0700)]
Automated import from //branches/cupcake/...@141669,141669
Dianne Hackborn [Wed, 25 Mar 2009 00:45:38 +0000 (17:45 -0700)]
Automated import from //branches/donutburger/...@140489,140489
The Android Open Source Project [Fri, 20 Mar 2009 06:08:36 +0000 (23:08 -0700)]
auto import from //branches/cupcake_rel/...@141571
The Android Open Source Project [Thu, 19 Mar 2009 03:53:43 +0000 (20:53 -0700)]
auto import //branches/donutburger/...@140359
The Android Open Source Project [Thu, 19 Mar 2009 00:39:42 +0000 (17:39 -0700)]
auto import from //branches/cupcake_rel/...@140373
android-build SharedAccount [Sat, 14 Mar 2009 06:22:59 +0000 (23:22 -0700)]
add Launcher as home
The Android Open Source Project [Fri, 13 Mar 2009 20:04:19 +0000 (13:04 -0700)]
auto import from //branches/cupcake_rel/...@138607
The Android Open Source Project [Wed, 11 Mar 2009 19:11:54 +0000 (12:11 -0700)]
auto import from //branches/cupcake/...@137873