Android (Google) Code Review
8fead6912e
Merge change 22448 into donut
...
* changes:
incremental OTAs should remove /system/recovery.img
2009-08-24 10:36:06 -07:00
The Android Open Source Project
45ce9badc4
ERC55B
2009-08-24 10:34:20 -07:00
Doug Zongker
3b949f0725
incremental OTAs should remove /system/recovery.img
...
This file has been replaced by the recovery_from_boot.p patch file,
but needs to be removed from existing devices if it exists.
2009-08-24 10:24:32 -07:00
The Android Open Source Project
1687276897
ERC55
2009-08-24 08:35:46 -07:00
The Android Open Source Project
1dcaf3b87c
Merge commit 'remotes/goog/eclair' into eclair-release
2009-08-24 08:35:35 -07:00
Scott Su
40ea53098c
Remove frameworks/base/im from build path
2009-08-23 23:43:24 -07:00
Scott Main
d59c2ce372
am aab0d4c9: am 72a5cc82: Merge change 22354 into donut
...
Merge commit 'aab0d4c9f9c175a287aca3954921cbf7731bf1f7'
* commit 'aab0d4c9f9c175a287aca3954921cbf7731bf1f7':
docs only.
2009-08-22 07:50:38 -07:00
Scott Main
4fcef1e3bf
am 102400f8: am eca5e16e: Merge change 22348 into donut
...
Merge commit '102400f8e235e066bde697f8165b9b0d35e59ac7'
* commit '102400f8e235e066bde697f8165b9b0d35e59ac7':
docs only.
2009-08-22 07:50:35 -07:00
Phil Dubach
5ab2b7b6c7
am dd6c1e11: am 7c463e4b: Merge change 21778 into donut
...
Merge commit 'dd6c1e11c5ce3177320ab689b6d531bdaf141892'
* commit 'dd6c1e11c5ce3177320ab689b6d531bdaf141892':
CTS: Enable Python description/plan generator
2009-08-22 07:50:32 -07:00
Scott Main
aab0d4c9f9
am 72a5cc82: Merge change 22354 into donut
...
Merge commit '72a5cc829038254988054046c302550d6821a300' into eclair
* commit '72a5cc829038254988054046c302550d6821a300':
docs only.
2009-08-22 07:44:20 -07:00
Scott Main
102400f8e2
am eca5e16e: Merge change 22348 into donut
...
Merge commit 'eca5e16e057cc6915c07ea4138929c44a013aba6' into eclair
* commit 'eca5e16e057cc6915c07ea4138929c44a013aba6':
docs only.
2009-08-22 07:44:16 -07:00
Phil Dubach
dd6c1e11c5
am 7c463e4b: Merge change 21778 into donut
...
Merge commit '7c463e4b0565f752bc06feb98962ab1536937aa1' into eclair
* commit '7c463e4b0565f752bc06feb98962ab1536937aa1':
CTS: Enable Python description/plan generator
2009-08-22 07:43:37 -07:00
Android (Google) Code Review
72a5cc8290
Merge change 22354 into donut
...
* changes:
docs only. add donut image for homepage announcement.
2009-08-21 16:38:35 -07:00
Scott Main
37a4d1cb5c
docs only.
...
add donut image for homepage announcement.
2009-08-21 16:37:09 -07:00
The Android Open Source Project
786d66abb9
ERC52C
2009-08-21 16:30:15 -07:00
The Android Open Source Project
e395d0e1a6
ERC52B
2009-08-21 16:17:58 -07:00
Android (Google) Code Review
eca5e16e05
Merge change 22348 into donut
...
* changes:
docs only. remove preliminary watermak
2009-08-21 16:12:25 -07:00
Scott Main
d22b5e108d
docs only.
...
remove preliminary watermak
2009-08-21 16:11:02 -07:00
Android (Google) Code Review
7c463e4b05
Merge change 21778 into donut
...
* changes:
CTS: Enable Python description/plan generator
2009-08-21 14:41:40 -07:00
The Android Open Source Project
0f6f48e0a7
DRC52
2009-08-21 14:20:25 -07:00
The Android Open Source Project
f15c6f314a
Merge commit 'remotes/goog/donut' into donut-release
2009-08-21 14:20:17 -07:00
The Android Open Source Project
9bea88781a
ERC52
2009-08-21 07:05:52 -07:00
The Android Open Source Project
8d8320f96f
Merge commit 'remotes/goog/eclair' into eclair-release
2009-08-21 07:05:41 -07:00
Jeff Hamilton
72fd1f1ad8
am 0c51de15: Prefer ContactsProvider over GoogleContactsProvider.
...
Merge commit '0c51de15fd3279f1c67d4b9834ebd7334fe82f79'
* commit '0c51de15fd3279f1c67d4b9834ebd7334fe82f79':
Prefer ContactsProvider over GoogleContactsProvider.
2009-08-21 02:03:41 -07:00
Jeff Hamilton
0c51de15fd
Prefer ContactsProvider over GoogleContactsProvider.
2009-08-21 00:38:17 -05:00
Doug Zongker
98cb09e37a
am 1f8b697a: am e05628cc: fix signing user builds
...
Merge commit '1f8b697a7fc3102e495972fec0d8bca7e5698098'
* commit '1f8b697a7fc3102e495972fec0d8bca7e5698098':
fix signing user builds
2009-08-20 18:23:05 -07:00
Doug Zongker
1f8b697a7f
am e05628cc: fix signing user builds
...
Merge commit 'e05628cc8df4ec4b69befa9652d81eb81f0ab008' into eclair
* commit 'e05628cc8df4ec4b69befa9652d81eb81f0ab008':
fix signing user builds
2009-08-20 18:18:29 -07:00
Doug Zongker
e05628cc8d
fix signing user builds
...
When unzipping a target-files which has been signed with OTA key
replacement, you'll get "overwrite this file?" prompts because the key
files appear in the zip files twice. Suppress these prompts.
Many developer phone products don't define PRODUCT_OTA_PUBLIC_KEYS, so
add a default key.
This change doesn't affect device code.
2009-08-20 18:02:47 -07:00
The Android Open Source Project
7619d63095
DRC51
2009-08-20 16:56:11 -07:00
The Android Open Source Project
44ef1c2d07
Merge commit 'remotes/goog/donut' into donut-release
2009-08-20 16:56:01 -07:00
The Android Open Source Project
1581c91ba9
ERC51B
2009-08-20 12:11:53 -07:00
The Android Open Source Project
9c63057405
Merge commit 'remotes/goog/eclair' into eclair-release
2009-08-20 12:11:41 -07:00
Dirk Dougherty
9e85734425
am 724735d2: am 6f7ba2dc: Merge change 20234 into donut
...
Merge commit '724735d2be4dd75207e53dff752feb6bd3a9dd6b'
* commit '724735d2be4dd75207e53dff752feb6bd3a9dd6b':
Remove extraneous quotation mark in template file
2009-08-20 10:41:02 -07:00
Dirk Dougherty
724735d2be
am 6f7ba2dc: Merge change 20234 into donut
...
Merge commit '6f7ba2dce2c112eb4be33dbad54751d55ddd2276' into eclair
* commit '6f7ba2dce2c112eb4be33dbad54751d55ddd2276':
Remove extraneous quotation mark in template file
2009-08-20 10:36:47 -07:00
Android (Google) Code Review
6f7ba2dce2
Merge change 20234 into donut
...
* changes:
Remove extraneous quotation mark in template file
2009-08-20 10:33:11 -07:00
Andrei Popescu
d6a2e6d384
am fb71fe71: Clean libwebcore after new WebKit merge
...
Merge commit 'fb71fe7126bf0071537837c454f5d3e0e0c83aa3'
* commit 'fb71fe7126bf0071537837c454f5d3e0e0c83aa3':
Clean libwebcore after new WebKit merge
2009-08-20 09:04:57 -07:00
The Android Open Source Project
0bfe8d0551
ERC51
2009-08-20 07:06:12 -07:00
The Android Open Source Project
439a3a0e2d
Merge commit 'remotes/goog/eclair' into eclair-release
2009-08-20 07:05:58 -07:00
Andrei Popescu
fb71fe7126
Clean libwebcore after new WebKit merge
2009-08-20 12:42:30 +01:00
Phil Dubach
5e3ab04d97
CTS: Enable Python description/plan generator
...
This enables the new description/plan generator added in change
21366.
2009-08-19 17:03:21 -07:00
Dianne Hackborn
bb4ddabb84
am a3f7c20f: Merge change 21912 into eclair
...
Merge commit 'a3f7c20f907dca3e8de5664bf8c3e7dec4f0db05'
* commit 'a3f7c20f907dca3e8de5664bf8c3e7dec4f0db05':
Bump platform version to 4.
2009-08-19 16:51:28 -07:00
Raphael
7294dae26f
am 28fcfdd7: Fix broken server Windows SDK build.
...
Merge commit '28fcfdd7dd8752bc9accf800306d82a3a8d138da'
* commit '28fcfdd7dd8752bc9accf800306d82a3a8d138da':
Fix broken server Windows SDK build.
2009-08-19 16:51:27 -07:00
The Android Open Source Project
a9409a26b8
DRC50
2009-08-19 15:06:00 -07:00
The Android Open Source Project
1906fbafdc
Merge commit 'remotes/goog/donut' into donut-release
2009-08-19 15:05:51 -07:00
Android (Google) Code Review
a3f7c20f90
Merge change 21912 into eclair
...
* changes:
Bump platform version to 4.
2009-08-19 14:46:27 -07:00
Raphael
28fcfdd7dd
Fix broken server Windows SDK build.
...
I removed these lines because for some reason building under Windows
fails for me when they are present. However the build server breaks
so I'll rolling them back and I'll try to understand that later.
2009-08-19 14:06:33 -07:00
Raphael
5f9498b7b3
am c798114c: Merge change 21783 into eclair
...
Merge commit 'c798114c04feab62c22000d6a9bbfa805ce70e55'
* commit 'c798114c04feab62c22000d6a9bbfa805ce70e55':
Windows: Fix platform build.
2009-08-19 12:16:11 -07:00
Scott Main
aeb8fd7ee1
am f036631b: am 54161d14: DOCS ONLY. styleheet changes to fix some errors in the print layout and remove extra space from above nested lists, so they fit closer to the parent list item.
...
Merge commit 'f036631b02bca65818cc02767c5389e5de1f67a8'
* commit 'f036631b02bca65818cc02767c5389e5de1f67a8':
DOCS ONLY.
2009-08-19 12:16:10 -07:00
Android (Google) Code Review
c798114c04
Merge change 21783 into eclair
...
* changes:
Windows: Fix platform build.
2009-08-19 12:11:38 -07:00
Raphael
f6ff4c5acf
Windows: Fix platform build.
2009-08-19 11:32:15 -07:00