OSDN Git Service
Evan JIANG [Fri, 23 Jan 2009 16:11:30 +0000 (00:11 +0800)]
Fix "make modules" script bug under Mac OS X.
For Mac OS uses BSD sed, it doesn't support "\n". Then, "make modules"
command cannot work correctly under Mac OS. Using tr command to replace
sed command, it has the same behavior under both Mac OS and Linux.
Change-Id: I29e044cc66bf24f6459cbb33164fd9f55f772e3c
Raphael Moll [Sun, 18 Apr 2010 07:07:37 +0000 (00:07 -0700)]
Remove obsolete machine-setup.html reference.
Bug 1231
Change-Id: I629361cf5dddc9d0fbf493e016f1aaf2a50b6935
Raphael Moll [Tue, 13 Apr 2010 17:38:35 +0000 (10:38 -0700)]
Fix "make layoutlib" under Windows+Cygwin
Change-Id: I5277afe77f1e3367ecfd0933a9ab14a5a42c2be2
The Android Open Source Project [Tue, 9 Mar 2010 00:43:00 +0000 (16:43 -0800)]
merge from open-source master
Change-Id: I7254b628bba1be9222a643e9e8c73e1240f645d7
Jean-Baptiste Queru [Fri, 5 Mar 2010 15:23:14 +0000 (07:23 -0800)]
Merge from eclair
Change-Id: I4496dadd8a738a05c647589ca78732e9b608ca29
Jean-Baptiste Queru [Fri, 5 Mar 2010 01:31:28 +0000 (17:31 -0800)]
Add provisioning app in the generic build
Change-Id: Iffdd4d21a3c55e7a73d58289fda31ac8a27a18ac
Jean-Baptiste Queru [Fri, 22 Jan 2010 21:25:24 +0000 (13:25 -0800)]
Look for product configs in device/ in addition to vendor/
This will allow to create open-sourceable product configurations.
Change-Id: I4e73347c2095935340bfc8c3737c2adf1ef22a9c
Doug Zongker [Mon, 1 Mar 2010 20:36:07 +0000 (12:36 -0800)]
Merge commit '
27bb6f5f' into manualmerge
Doug Zongker [Tue, 8 Dec 2009 21:46:44 +0000 (13:46 -0800)]
add signing checker script to releasetools
The check_target_files_signatures determines what key was used to sign
every .apk in a given target_files. It can compare that signature to
that of another target_files (eg, the previous release for that
device) and flag any problems such as .apks signed with a different
key.
(This is a backport of a change in froyo. It does not affect device
code, only the scripts that sign images and OTA packages.)
Jean-Baptiste Queru [Wed, 24 Feb 2010 23:57:23 +0000 (15:57 -0800)]
Don't build OTA package for aosp_emulator_us
This allows "make dist" to work on that configuration.
A better fix would be to allow each product to specify
whether it's an emulator target or a device target, and
to adapt to that, but that'd be a lot more intrusive.
Change-Id: I47708025204a4991466abceb1708a3020a543238
The Android Open Source Project [Fri, 5 Feb 2010 16:43:41 +0000 (08:43 -0800)]
am
97233468: reconcile main tree with open-source eclair
Merge commit '
97233468715838e42b98abe047c60e108fcc44bd' into eclair-plus-aosp
* commit '
97233468715838e42b98abe047c60e108fcc44bd': (198 commits)
android-2.1_r1 snapshot
ERD79
ERD78
ERD77D
ERD77C
ERD77B
ERD77
ERD76
ERD75
ERD72
ERD71F
ERD71E
ERD71D
ERD71C
ERD71B
ERD71
ERD70B
ERD70
ERD69
ERD68B
...
The Android Open Source Project [Fri, 5 Feb 2010 16:09:32 +0000 (08:09 -0800)]
reconcile main tree with open-source eclair
Doug Zongker [Tue, 2 Feb 2010 16:53:17 +0000 (08:53 -0800)]
am
cdb621bf: retry patch using cache if in-place write fails
Merge commit '
cdb621bfea3083afbea238dbf374826742aca6d0' into eclair-plus-aosp
* commit '
cdb621bfea3083afbea238dbf374826742aca6d0':
retry patch using cache if in-place write fails
Doug Zongker [Tue, 2 Feb 2010 16:44:12 +0000 (08:44 -0800)]
retry patch using cache if in-place write fails
[cherry-pick from donut branch]
Instead of failing outright when yaffs lies about how much space is
free on the filesystem, delete the partially-written output file and
retry using the copy-source-to-cache method instead.
Change all the log statements to printf; mixing stdout and stderr
logging just makes the logs hard to read because they're buffered
differently.
The Android Open Source Project [Fri, 29 Jan 2010 22:07:32 +0000 (14:07 -0800)]
reconcile android-2.1_r1 snapshot
Ed Heyl [Tue, 26 Jan 2010 23:01:17 +0000 (15:01 -0800)]
am
25a331ab: Merge "Update version string." into eclair
Merge commit '
25a331ab870edcf31dbbfab0a9e6f4cef88654f5' into eclair-plus-aosp
* commit '
25a331ab870edcf31dbbfab0a9e6f4cef88654f5':
Update version string.
Scott Main [Tue, 26 Jan 2010 23:01:13 +0000 (15:01 -0800)]
am
e6fed880: Merge "docs: accept the enter key on key-down, rather than key-up, in order to be sure we capture this key before anything else. Fixes case where highlighted suggestions don\'t get executed when pressed. Bug:
1909300" into eclair
Merge commit '
e6fed8807f469a91e10b64990a7709482378dfa9' into eclair-plus-aosp
* commit '
e6fed8807f469a91e10b64990a7709482378dfa9':
docs: accept the enter key on key-down, rather than key-up,
Ed Heyl [Tue, 26 Jan 2010 22:55:33 +0000 (14:55 -0800)]
Merge "Update version string." into eclair
Dianne Hackborn [Tue, 26 Jan 2010 20:54:40 +0000 (12:54 -0800)]
Update version string.
Change-Id: I9b03dadcbc93109f9c91bb9813a41ec23a6c1448
Scott Main [Mon, 25 Jan 2010 23:39:40 +0000 (15:39 -0800)]
Merge "docs: accept the enter key on key-down, rather than key-up, in order to be sure we capture this key before anything else. Fixes case where highlighted suggestions don't get executed when pressed. Bug:
1909300" into eclair
Scott Main [Mon, 25 Jan 2010 22:38:43 +0000 (14:38 -0800)]
docs: accept the enter key on key-down, rather than key-up,
in order to be sure we capture this key before anything else.
Fixes case where highlighted suggestions don't get executed
when pressed.
Bug:
1909300
Raphael [Mon, 25 Jan 2010 22:30:49 +0000 (14:30 -0800)]
am
e749b5a7: Fix windows make: layoutlib_api moved to sdk.git too.
Merge commit '
e749b5a71abe9c3659921c50cc4468a1a4f984f5' into eclair-plus-aosp
* commit '
e749b5a71abe9c3659921c50cc4468a1a4f984f5':
Fix windows make: layoutlib_api moved to sdk.git too.
Raphael [Sat, 23 Jan 2010 02:36:37 +0000 (18:36 -0800)]
Fix windows make: layoutlib_api moved to sdk.git too.
Change-Id: Ia030eda4514361b20a5ecb29c997ab625909228c
Dirk Dougherty [Fri, 22 Jan 2010 22:27:55 +0000 (14:27 -0800)]
am
6339cfe8: Merge "doc change: add announce for developer lab at mwc." into eclair
Merge commit '
6339cfe89b62bfa7803ff93c4fc13c9be759f47a' into eclair-plus-aosp
* commit '
6339cfe89b62bfa7803ff93c4fc13c9be759f47a':
doc change: add announce for developer lab at mwc.
Dirk Dougherty [Fri, 22 Jan 2010 22:23:07 +0000 (14:23 -0800)]
Merge "doc change: add announce for developer lab at mwc." into eclair
Dirk Dougherty [Wed, 20 Jan 2010 23:36:11 +0000 (15:36 -0800)]
doc change: add announce for developer lab at mwc.
Bug:
2160782
Change-Id: I363e964f0d35eaf7b2d7593d6a3630196ed6de33
Scott Main [Tue, 19 Jan 2010 19:13:44 +0000 (11:13 -0800)]
am
945ed36e: docs: add the ability to exclude PRE elements from being prettified by adding the class "no-pretty-print" (needs to hyphenate \'prettyprint\', otherwise the prettify script will parse "no-prettyprint" the same as "prettyprint")
Merge commit '
945ed36ec486f83c4546cac8d6bed954dfe32c4e' into eclair-plus-aosp
* commit '
945ed36ec486f83c4546cac8d6bed954dfe32c4e':
docs: add the ability to exclude PRE elements from being prettified
Scott Main [Sat, 16 Jan 2010 01:30:38 +0000 (17:30 -0800)]
docs: add the ability to exclude PRE elements from being prettified
by adding the class "no-pretty-print" (needs to hyphenate 'prettyprint',
otherwise the prettify script will parse "no-prettyprint" the same as
"prettyprint")
Scott Main [Wed, 13 Jan 2010 19:18:02 +0000 (11:18 -0800)]
am
3556305e: Merge "docs: hide the "back to top" link when there\'s no vertical scroll also use local variables for DOM objects (in a slow effort to eventually remove all non-essential global vars)" into eclair
Merge commit '
3556305eb00cd63ce75bc5ef4a84fd1b454c50fb' into eclair-plus-aosp
* commit '
3556305eb00cd63ce75bc5ef4a84fd1b454c50fb':
docs: hide the "back to top" link when there's no vertical scroll
Scott Main [Wed, 13 Jan 2010 19:07:54 +0000 (11:07 -0800)]
Merge "docs: hide the "back to top" link when there's no vertical scroll also use local variables for DOM objects (in a slow effort to eventually remove all non-essential global vars)" into eclair
Scott Main [Tue, 12 Jan 2010 21:37:00 +0000 (13:37 -0800)]
docs: hide the "back to top" link when there's no vertical scroll
also use local variables for DOM objects (in a slow effort to eventually
remove all non-essential global vars)
Raphael Moll [Tue, 12 Jan 2010 23:38:41 +0000 (15:38 -0800)]
am
d1b68863: Merge "Add etc1tool to Windows SDK." into eclair
Merge commit '
d1b68863f5ef252a92adcfb22d3ca48872981a61' into eclair-plus-aosp
* commit '
d1b68863f5ef252a92adcfb22d3ca48872981a61':
Add etc1tool to Windows SDK.
Raphael Moll [Tue, 12 Jan 2010 23:32:00 +0000 (15:32 -0800)]
Merge "Add etc1tool to Windows SDK." into eclair
The Android Open Source Project [Tue, 12 Jan 2010 23:18:07 +0000 (15:18 -0800)]
android-2.1_r1 snapshot
Scott Main [Tue, 12 Jan 2010 20:23:50 +0000 (12:23 -0800)]
am
7e680c89: Merge "docs: make the Resources docs use the same clearsilver template as the Dev Guide. This removes the custom resourcespage.cs file and routes resources pages to use docpage.cs, while still setting the resource hdf flag true (in order to highlight the
Merge commit '
7e680c89ae01ca30c411f32e2e7ca1c093db0336' into eclair-plus-aosp
* commit '
7e680c89ae01ca30c411f32e2e7ca1c093db0336':
docs: make the Resources docs use the same clearsilver template
Scott Main [Tue, 12 Jan 2010 20:19:56 +0000 (12:19 -0800)]
Merge "docs: make the Resources docs use the same clearsilver template as the Dev Guide. This removes the custom resourcespage.cs file and routes resources pages to use docpage.cs, while still setting the resource hdf flag true (in order to highlight the Resources tab)." into eclair
Raphael [Tue, 12 Jan 2010 19:14:17 +0000 (11:14 -0800)]
Add etc1tool to Windows SDK.
SDK BUG
2368918
This depends on Change I83485145 from development.git.
Change-Id: I1b4f5e39bd08c0cfbb656f2857921fb5ad305812
Dirk Dougherty [Thu, 7 Jan 2010 20:43:47 +0000 (12:43 -0800)]
am
5b395224: Merge "SDK doc change: css styling for blockquote." into eclair
Merge commit '
5b3952249ccf7e41ac6a0ac1490cf150bca3a80f' into eclair-plus-aosp
* commit '
5b3952249ccf7e41ac6a0ac1490cf150bca3a80f':
SDK doc change: css styling for blockquote.
Dirk Dougherty [Thu, 7 Jan 2010 20:39:47 +0000 (12:39 -0800)]
Merge "SDK doc change: css styling for blockquote." into eclair
Dirk Dougherty [Thu, 7 Jan 2010 20:09:07 +0000 (12:09 -0800)]
SDK doc change: css styling for blockquote.
Bug:
2160782
Change-Id: I99a9494feb8b754636745f979db27380ae623c96
Scott Main [Thu, 7 Jan 2010 18:06:00 +0000 (10:06 -0800)]
am
b6da4808: update for change Ia39d3bb0, which regressed a resizing hack for IE6.
Merge commit '
b6da4808699180c608bccef88ddb843411e663c7' into eclair-plus-aosp
* commit '
b6da4808699180c608bccef88ddb843411e663c7':
update for change Ia39d3bb0, which regressed a resizing hack for IE6.
Scott Main [Wed, 6 Jan 2010 22:18:02 +0000 (14:18 -0800)]
update for change Ia39d3bb0, which regressed a resizing hack for IE6.
This now will avoid writing the cookie for the width when IE6 calls
resizeWidth() in order to properly resize the doc-content div (other
browsers to not call resizeWidth() for resizing doc-content because it
has auto width, which IE6 does not perform).
Scott Main [Thu, 7 Jan 2010 00:55:15 +0000 (16:55 -0800)]
am
a39d3bb0: docs: fix resizeAll script for IE6 so that the resizeWidth function is only called when the side navigation is actually resizable
Merge commit '
a39d3bb0c9001c79f93ae829d564e5fef27a573a' into eclair-plus-aosp
* commit '
a39d3bb0c9001c79f93ae829d564e5fef27a573a':
docs: fix resizeAll script for IE6 so that the resizeWidth function
Scott Main [Wed, 6 Jan 2010 22:18:02 +0000 (14:18 -0800)]
docs: fix resizeAll script for IE6 so that the resizeWidth function
is only called when the side navigation is actually resizable
This stops 'width' cookies from being written for the SDK docs
(and any other page that doesn't have resizable nav) and also adds
some security to the init() function to be sure we properly read
cookie names.
Jean-Baptiste Queru [Mon, 21 Dec 2009 23:31:49 +0000 (15:31 -0800)]
merge from open-source master
The Android Automerger [Sat, 19 Dec 2009 00:26:01 +0000 (16:26 -0800)]
ERD79
The Android Automerger [Sat, 19 Dec 2009 00:25:42 +0000 (16:25 -0800)]
Merge branch 'eclair' into eclair-release
Brett Chabot [Fri, 18 Dec 2009 00:38:04 +0000 (16:38 -0800)]
am
1e43c510: Add CTS accounts tests to CTS makefile.
Merge commit '
1e43c510758439b3195597056121c59b71481254' into eclair-plus-aosp
* commit '
1e43c510758439b3195597056121c59b71481254':
Add CTS accounts tests to CTS makefile.
Brett Chabot [Thu, 17 Dec 2009 23:14:40 +0000 (15:14 -0800)]
Add CTS accounts tests to CTS makefile.
Change-Id: If7d87e2deed2036536ad852c382dca0e8bbad87b
android-build SharedAccount [Thu, 17 Dec 2009 21:51:56 +0000 (13:51 -0800)]
ERD78
android-build SharedAccount [Thu, 17 Dec 2009 21:50:50 +0000 (13:50 -0800)]
Merge branch 'eclair' into eclair-release
Scott Main [Thu, 17 Dec 2009 20:52:54 +0000 (12:52 -0800)]
docs: make the Resources docs use the same clearsilver template
as the Dev Guide. This removes the custom resourcespage.cs file
and routes resources pages to use docpage.cs, while still
setting the resource hdf flag true (in order to highlight the
Resources tab).
android-build SharedAccount [Thu, 17 Dec 2009 06:53:31 +0000 (22:53 -0800)]
ERD77D
android-build SharedAccount [Thu, 17 Dec 2009 06:42:24 +0000 (22:42 -0800)]
ERD77C
Scott Main [Thu, 17 Dec 2009 05:40:55 +0000 (21:40 -0800)]
am
99a25fba: Merge change I92c7fe59 into eclair
Merge commit '
99a25fbaa50a077c5d62b9ae204677c176534d8b' into eclair-plus-aosp
* commit '
99a25fbaa50a077c5d62b9ae204677c176534d8b':
docs: change DOCTYPE to html5 format
Android (Google) Code Review [Thu, 17 Dec 2009 05:38:02 +0000 (21:38 -0800)]
Merge change I92c7fe59 into eclair
* changes:
docs: change DOCTYPE to html5 format
Scott Main [Thu, 17 Dec 2009 05:36:15 +0000 (21:36 -0800)]
docs: change DOCTYPE to html5 format
Scott Main [Wed, 16 Dec 2009 23:44:37 +0000 (15:44 -0800)]
am
ab32fed6: docs for esr: add support for breadcrumbing in the resource docs
Merge commit '
ab32fed6a8efbdb8640f6f6b355b751fd6c7eb53' into eclair-plus-aosp
* commit '
ab32fed6a8efbdb8640f6f6b355b751fd6c7eb53':
docs for esr: add support for breadcrumbing in the resource docs
Scott Main [Wed, 16 Dec 2009 23:36:20 +0000 (15:36 -0800)]
docs for esr: add support for breadcrumbing in the resource docs
android-build SharedAccount [Wed, 16 Dec 2009 21:50:57 +0000 (13:50 -0800)]
ERD77B
android-build SharedAccount [Wed, 16 Dec 2009 15:41:25 +0000 (07:41 -0800)]
ERD77
android-build SharedAccount [Wed, 16 Dec 2009 15:40:36 +0000 (07:40 -0800)]
Merge branch 'eclair' into eclair-release
Dirk Dougherty [Wed, 16 Dec 2009 03:29:52 +0000 (19:29 -0800)]
am
8c627b04: Merge change Ib471b5b2 into eclair
Merge commit '
8c627b04898cab723e0df8666a7cc11d5d1c70f1' into eclair-plus-aosp
* commit '
8c627b04898cab723e0df8666a7cc11d5d1c70f1':
sdk doc change for esr: Add left nav highlight for interior files in resources tab.
Android (Google) Code Review [Wed, 16 Dec 2009 03:26:48 +0000 (19:26 -0800)]
Merge change Ib471b5b2 into eclair
* changes:
sdk doc change for esr: Add left nav highlight for interior files in resources tab.
Dirk Dougherty [Wed, 16 Dec 2009 02:48:38 +0000 (18:48 -0800)]
sdk doc change for esr: Add left nav highlight for interior files in resources tab.
Bug:
2160782
Change-Id: Ib471b5b28f599447e77294c8dcc23d24a18c3436
android-build SharedAccount [Tue, 15 Dec 2009 22:19:28 +0000 (14:19 -0800)]
ERD76
android-build SharedAccount [Tue, 15 Dec 2009 22:19:09 +0000 (14:19 -0800)]
Merge branch 'eclair' into eclair-release
Xavier Ducrohet [Tue, 15 Dec 2009 18:33:15 +0000 (10:33 -0800)]
am
920f2aae: Add the LiveWallpaper sample as prebuilt to the SDK system image.
Merge commit '
920f2aaee64cc21f00d712ba17a1dded02ccff6b' into eclair-plus-aosp
* commit '
920f2aaee64cc21f00d712ba17a1dded02ccff6b':
Add the LiveWallpaper sample as prebuilt to the SDK system image.
Xavier Ducrohet [Tue, 15 Dec 2009 15:42:24 +0000 (07:42 -0800)]
am
fac84b56: Merge change Icb5cf14e into eclair
Merge commit '
fac84b561193a62b3e9bc7a50b8948a6356be92c' into eclair-plus-aosp
* commit '
fac84b561193a62b3e9bc7a50b8948a6356be92c':
Add feature list support to DroidDoc.
Xavier Ducrohet [Tue, 15 Dec 2009 15:41:17 +0000 (07:41 -0800)]
am
88f254bf: Add gallery to the SDK build now that it\'s split from the Camera app.
Merge commit '
88f254bf55b8a78921d94f40e3bcc9c25a348570' into eclair-plus-aosp
* commit '
88f254bf55b8a78921d94f40e3bcc9c25a348570':
Add gallery to the SDK build now that it's split from the Camera app.
Dirk Dougherty [Tue, 15 Dec 2009 15:38:57 +0000 (07:38 -0800)]
am
502c498f: sdk doc change for esr: add "Resources" tab and modify templates to build content for it.
Merge commit '
502c498fec23cb28d16f5e86e981400f76da36ea' into eclair-plus-aosp
* commit '
502c498fec23cb28d16f5e86e981400f76da36ea':
sdk doc change for esr: add "Resources" tab and modify templates to build content for it.
Xavier Ducrohet [Tue, 15 Dec 2009 06:37:13 +0000 (22:37 -0800)]
Add the LiveWallpaper sample as prebuilt to the SDK system image.
Change-Id: I5a1b0d2e383b757e52879792ee80dbd61f97f9a4
Android (Google) Code Review [Tue, 15 Dec 2009 02:20:10 +0000 (18:20 -0800)]
Merge change Icb5cf14e into eclair
* changes:
Add feature list support to DroidDoc.
The Android Automerger [Tue, 15 Dec 2009 02:04:41 +0000 (18:04 -0800)]
ERD75
The Android Automerger [Tue, 15 Dec 2009 02:04:14 +0000 (18:04 -0800)]
Merge branch 'eclair' into eclair-release
Xavier Ducrohet [Tue, 15 Dec 2009 01:55:05 +0000 (17:55 -0800)]
Add feature list support to DroidDoc.
Similarly to intent actions/categories, DroidDoc look
for the FEATURE-type SdkConstant annotation and builds
a list of optional features for the platform.
This is then packaged with the SDK to be used by the
custom editors (manifest editor in this case)
Change-Id: Icb5cf14ebd8251017cd850eacfdbb889219b3697
Xavier Ducrohet [Tue, 15 Dec 2009 00:46:05 +0000 (16:46 -0800)]
Add gallery to the SDK build now that it's split from the Camera app.
Bug:
2275030
Change-Id: Iad74a37d0df1d77185062cb4323665be7185c242
Dirk Dougherty [Thu, 3 Dec 2009 02:01:16 +0000 (18:01 -0800)]
sdk doc change for esr: add "Resources" tab and modify templates to build content for it.
Bug:
2160782
Change-Id: I5c45bdf4861ba2dc150e95d5523367a14b401304
The Android Automerger [Fri, 11 Dec 2009 21:23:24 +0000 (13:23 -0800)]
ERD72
android-build SharedAccount [Fri, 11 Dec 2009 02:56:46 +0000 (18:56 -0800)]
ERD71F
android-build SharedAccount [Fri, 11 Dec 2009 00:32:57 +0000 (16:32 -0800)]
ERD71E
The Android Automerger [Fri, 11 Dec 2009 00:22:18 +0000 (16:22 -0800)]
ERD71D
android-build SharedAccount [Thu, 10 Dec 2009 19:25:53 +0000 (11:25 -0800)]
ERD71C
The Android Automerger [Thu, 10 Dec 2009 19:17:20 +0000 (11:17 -0800)]
ERD71B
The Android Automerger [Thu, 10 Dec 2009 17:01:57 +0000 (09:01 -0800)]
ERD71
The Android Automerger [Thu, 10 Dec 2009 17:01:32 +0000 (09:01 -0800)]
Merge branch 'eclair' into eclair-release
Ravi K Yenduri [Thu, 10 Dec 2009 09:34:19 +0000 (15:04 +0530)]
Enable building for simulator
Scott Main [Thu, 10 Dec 2009 02:17:50 +0000 (18:17 -0800)]
am
1dd6ff63: Merge change I483cf38d into eclair
Merge commit '
1dd6ff638f14e3c583eaa89d0b7341a3811293da' into eclair-plus-aosp
* commit '
1dd6ff638f14e3c583eaa89d0b7341a3811293da':
docs: add "figure" class for DIV elements that contain
Android (Google) Code Review [Thu, 10 Dec 2009 02:13:09 +0000 (18:13 -0800)]
Merge change I483cf38d into eclair
* changes:
docs: add "figure" class for DIV elements that contain a figure image with caption text.
Scott Main [Thu, 10 Dec 2009 02:08:32 +0000 (18:08 -0800)]
docs: add "figure" class for DIV elements that contain
a figure image with caption text.
needed (but not a dependency) by I1cd5c8282ba45d79da854db43d741b6fa049812b
Ying Wang [Wed, 9 Dec 2009 22:59:19 +0000 (14:59 -0800)]
am
6ef046c8: Fixes ProGuard options.
Merge commit '
6ef046c8932989ca97d1cb39413ef99761315a06' into eclair-plus-aosp
* commit '
6ef046c8932989ca97d1cb39413ef99761315a06':
Fixes ProGuard options.
The Android Automerger [Wed, 9 Dec 2009 22:46:56 +0000 (14:46 -0800)]
ERD70B
Ying Wang [Tue, 8 Dec 2009 02:14:00 +0000 (18:14 -0800)]
Fixes ProGuard options.
1. Dedup LOCAL_JAVA_LIBRARIES.
2. Even no resource or asset for a package, we still need to set
package_expected_intermediates_COMMON, which is anyway used by ProGuard.
The Android Automerger [Wed, 9 Dec 2009 16:50:44 +0000 (08:50 -0800)]
ERD70
The Android Automerger [Tue, 8 Dec 2009 16:49:07 +0000 (08:49 -0800)]
ERD69
The Android Automerger [Tue, 8 Dec 2009 16:48:45 +0000 (08:48 -0800)]
Merge branch 'eclair' into eclair-release
Scott Main [Tue, 8 Dec 2009 00:33:18 +0000 (16:33 -0800)]
am
9b0ad4c7: Merge change I79580117 into eclair
Merge commit '
9b0ad4c7258b586f1763bc497e8ed33f42ce446e' into eclair-plus-aosp
* commit '
9b0ad4c7258b586f1763bc497e8ed33f42ce446e':
docs: add context coloring to code snippets with prettify script
Android (Google) Code Review [Tue, 8 Dec 2009 00:29:47 +0000 (16:29 -0800)]
Merge change I79580117 into eclair
* changes:
docs: add context coloring to code snippets with prettify script
android-build SharedAccount [Tue, 8 Dec 2009 00:29:16 +0000 (16:29 -0800)]
ERD68B
The Android Automerger [Mon, 7 Dec 2009 16:29:34 +0000 (08:29 -0800)]
ERD68