Commit graph

6508 commits

Author SHA1 Message Date
The Android Open Source Project
a570bde9f8 Reconcile with ics-factoryrom-release
Change-Id: I6bcfc3069e62fe077704a9454abdd33e364cc637
2011-10-06 07:45:19 -07:00
The Android Automerger
ddda446a6f IFL06 2011-10-06 07:28:47 -07:00
The Android Automerger
32604d4fd8 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-10-06 07:21:34 -07:00
The Android Open Source Project
42c37ba412 Reconcile with ics-factoryrom-release
Change-Id: I7c2f0791fec871bd499afc9eaa41fd1dc55b91c5
2011-10-06 05:44:04 -07:00
The Android Automerger
3764a19091 IFL05C 2011-10-05 19:00:34 -07:00
The Android Automerger
75abbfd23c merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-10-05 18:58:14 -07:00
The Android Open Source Project
6fb71648db Reconcile with ics-factoryrom-release
Change-Id: Ic9d7efb8cb6228820010bb55973cef63b93b8e65
2011-10-05 16:15:57 -07:00
The Android Automerger
906b279473 IFL05B 2011-10-05 16:09:01 -07:00
The Android Automerger
0118dc63ce merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-10-05 16:05:31 -07:00
Scott Main
23f66d0927 Merge "docs: add ics logo for homepage" 2011-10-05 13:58:25 -07:00
Scott Main
76b6e18184 docs: add ics logo for homepage
Change-Id: I57504ce0919c88fd28ef550775b012b6c3d8498f
2011-10-05 13:53:36 -07:00
Doug Zongker
68fbf0fa52 am 49c6a2b5: fix build fingerprint: dev-keys vs test-keys
* commit '49c6a2b5e4314bd8acfbca88cd43ea49a2c8c30e':
  fix build fingerprint: dev-keys vs test-keys
2011-10-05 13:06:30 -07:00
Doug Zongker
49c6a2b5e4 fix build fingerprint: dev-keys vs test-keys
The fingerprint should only say dev-keys if it's actually using custom
keys; builds with the old default (from build/target/product/security)
should still say test-keys.

Change-Id: Ib8c662c348cf63f5db47e2f8f81bc3246cb15fdc
2011-10-05 12:41:56 -07:00
Doug Zongker
f41e67d82f am ad4142cc: Merge "add missing parameter to ReplaceOtaKeys" into ics-factoryrom
* commit 'ad4142cce8e8a4fe8c9cbfe92a49428ea789986e':
  add missing parameter to ReplaceOtaKeys
2011-10-05 11:32:16 -07:00
Doug Zongker
ad4142cce8 Merge "add missing parameter to ReplaceOtaKeys" into ics-factoryrom 2011-10-05 11:29:27 -07:00
Doug Zongker
b11e2d78ec add missing parameter to ReplaceOtaKeys
Change-Id: Ib596235a8e3b3588d363fea82b92b69895ee5408
2011-10-05 11:23:06 -07:00
Doug Zongker
a4bbf24afd am f9ede7e9: Merge "sign non-PRESIGNED prebuilt apks" into ics-factoryrom
* commit 'f9ede7e925a668cc8c0b44cb69c0795cb6c8c896':
  sign non-PRESIGNED prebuilt apks
2011-10-05 09:58:05 -07:00
Doug Zongker
f9ede7e925 Merge "sign non-PRESIGNED prebuilt apks" into ics-factoryrom 2011-10-05 09:55:58 -07:00
Doug Zongker
08d79c12de sign non-PRESIGNED prebuilt apks
Since dev keys can now vary per device, we can't assume they are
checked in with the correct signature.

Change-Id: I7577a3a6bd98d005c15936c99b2944acc4412798
2011-10-05 09:49:24 -07:00
Ying Wang
5f61c30230 am 0611aeed: Merge "Install path support for vendor modules." into ics-factoryrom
* commit '0611aeedeb58bf4df1f1143f602aa64c8dbddc35':
  Install path support for vendor modules.
2011-10-05 09:09:38 -07:00
Ying Wang
0611aeedeb Merge "Install path support for vendor modules." into ics-factoryrom 2011-10-05 09:07:53 -07:00
The Android Automerger
73f90cd549 IFL05 2011-10-05 06:41:13 -07:00
The Android Automerger
aaabcea9f1 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-10-05 06:37:40 -07:00
The Android Open Source Project
fad908eeb1 Reconcile with ics-factoryrom-release
Change-Id: I0889aad04af7434aa750ff2152a4ea7a0d0279e3
2011-10-05 06:13:05 -07:00
The Android Automerger
38f89a40d2 IFL04E 2011-10-04 21:35:24 -07:00
The Android Automerger
57b205b9d2 IFL04D 2011-10-04 16:30:32 -07:00
Doug Zongker
8b9a1b135e change OTA tools to handle variable dev keys
The signing and OTA-building tools now understand the
default_sys_dev_certificate value which may be present in the
META/misc_info.txt file of the target-files packages.

Change-Id: I64f09ec0b77a5184b6ddb74019255518776ee773
2011-10-04 16:30:31 -07:00
The Android Automerger
7d9799445d IFL04C 2011-10-04 16:17:19 -07:00
Ying Wang
fa2bf54a04 Support for product-specific dev keys.
Change-Id: Id577a72ee9f7cd70e8ca77efcbf10a37885c7d6f
2011-10-04 16:17:13 -07:00
Ed Heyl
213c1f985d am 81703a19: Merge "Support for product-specific dev keys." into ics-factoryrom
* commit '81703a19001ec219c35cb0ecf9bafb6e0dbc1e1d':
  Support for product-specific dev keys.
2011-10-04 16:15:25 -07:00
Doug Zongker
8fcea64be0 am 831840e5: change OTA tools to handle variable dev keys
* commit '831840e51b0403671f746ebc32090b7d6e548c08':
  change OTA tools to handle variable dev keys
2011-10-04 16:13:47 -07:00
Ed Heyl
81703a1900 Merge "Support for product-specific dev keys." into ics-factoryrom 2011-10-04 16:13:38 -07:00
Doug Zongker
831840e51b change OTA tools to handle variable dev keys
The signing and OTA-building tools now understand the
default_sys_dev_certificate value which may be present in the
META/misc_info.txt file of the target-files packages.

Change-Id: I64f09ec0b77a5184b6ddb74019255518776ee773
2011-10-04 16:02:01 -07:00
Xavier Ducrohet
54d34319d4 Merge "Put en_US as first product locale for SDK builds." 2011-10-04 14:26:08 -07:00
Xavier Ducrohet
7744f611ef Put en_US as first product locale for SDK builds.
Change-Id: I7b6dfa066aca75ba8d315bddf2492f81311a7761
2011-10-04 14:20:56 -07:00
The Android Automerger
138060bf6c IFL04B 2011-10-04 14:02:12 -07:00
The Android Automerger
88c3110640 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-10-04 13:59:05 -07:00
The Android Open Source Project
6b14da784a Reconcile with ics-factoryrom-release
Change-Id: I223d353a699f6f258e2a2e47f81d528879c4381b
2011-10-04 13:56:38 -07:00
Ying Wang
3c21fe5b12 Support for product-specific dev keys.
Change-Id: Id577a72ee9f7cd70e8ca77efcbf10a37885c7d6f
2011-10-04 10:50:08 -07:00
Ying Wang
12f60a5f34 Merge "Enforce no prebuilt apks in PRODUCT_COPY_FILES." 2011-10-04 10:14:43 -07:00
The Android Automerger
45a849049f IFL04 2011-10-04 06:30:21 -07:00
The Android Automerger
72dfd5cfc1 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-10-04 06:27:17 -07:00
Xavier Ducrohet
ad2a7a4175 Also package xhdpi res in the SDK image.
Change-Id: I39977f70b63353d1d61bbbef6207973ba2876ff9
2011-10-03 20:27:03 -07:00
The Android Automerger
9a5f0d04f4 IFL03C 2011-10-03 16:50:01 -07:00
The Android Automerger
dc40fafb49 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-10-03 16:49:41 -07:00
Scott Main
8e83353d47 docs: fix visual bug in the search tabs.
I assume this was introduced by a change in the CSE implementation

Change-Id: I776e385fd6c0d738a4bbf8372911b205c1f98123
2011-10-03 15:34:32 -07:00
The Android Automerger
7175656fff IFL03B 2011-10-03 14:55:41 -07:00
The Android Automerger
1b5f569537 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-10-03 14:51:54 -07:00
Scott Main
bc54702626 docs: add 'reference' class for use with 'special' to refine the headings
used within the 'special' div when in the reference.

Change-Id: Iebf84484e2eda104b2247aefc5a539f2a62c5102
2011-10-03 13:01:43 -07:00
The Android Open Source Project
4b7294d0b5 Reconcile with ics-factoryrom-release
Change-Id: I51b4b8d176ec0513747cded7d63a45ab0c527abd
2011-10-03 07:41:03 -07:00