OSDN Git Service
Android Git Automerger [Tue, 11 Oct 2011 17:12:21 +0000 (10:12 -0700)]
am
861348a4: Merge branch \'master\' of ssh://android-git:29418/platform/build
* commit '
861348a4be2355e49f090271d7410fa850d5c7f8':
Ed Heyl [Tue, 11 Oct 2011 17:12:20 +0000 (10:12 -0700)]
am
738f053b: (-s ours) mr0 - do not merge
* commit '
738f053bf3e00af8455d89dd4bb4724e83292e7e':
mr0 - do not merge
Android Git Automerger [Tue, 11 Oct 2011 17:10:35 +0000 (10:10 -0700)]
Merge branch 'master' of ssh://android-git:29418/platform/build
Ying Wang [Tue, 11 Oct 2011 17:04:27 +0000 (10:04 -0700)]
am
e27347e7: Merge "Enforce no nonexistent modules in PRODUCT_PACKAGES for sdk builds"
* commit '
e27347e7a4e41e250b689d54ae911522623b2427':
Enforce no nonexistent modules in PRODUCT_PACKAGES for sdk builds
Ying Wang [Tue, 11 Oct 2011 17:04:27 +0000 (10:04 -0700)]
am
5e550018: Merge "Remove PRODUCT_CONTRIBUTORS_FILE which is no longer in use."
* commit '
5e55001859062d8a0b11f26347b39c5f012bd1f6':
Remove PRODUCT_CONTRIBUTORS_FILE which is no longer in use.
Ying Wang [Tue, 11 Oct 2011 17:01:50 +0000 (10:01 -0700)]
Merge "Enforce no nonexistent modules in PRODUCT_PACKAGES for sdk builds"
Ying Wang [Tue, 11 Oct 2011 17:01:25 +0000 (10:01 -0700)]
Merge "Remove PRODUCT_CONTRIBUTORS_FILE which is no longer in use."
Ed Heyl [Tue, 11 Oct 2011 13:40:06 +0000 (06:40 -0700)]
mr0 - do not merge
Change-Id: I3b19b8cdad6820bc8ab2047ac48cb2964132a3fa
The Android Open Source Project [Tue, 11 Oct 2011 11:34:45 +0000 (04:34 -0700)]
am
2b2bf398: Reconcile with ics-factoryrom-release
* commit '
2b2bf3985ecb9ff9e0ebd51a62472fe6c6c1a39d':
IFL10
The Android Open Source Project [Tue, 11 Oct 2011 11:29:21 +0000 (04:29 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: I0a35a81c49649458f8c02b093a8638539c65049d
The Android Automerger [Tue, 11 Oct 2011 03:40:43 +0000 (20:40 -0700)]
IFL10
The Android Automerger [Tue, 11 Oct 2011 03:37:22 +0000 (20:37 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Ying Wang [Sat, 8 Oct 2011 21:31:54 +0000 (14:31 -0700)]
Enforce no nonexistent modules in PRODUCT_PACKAGES for sdk builds
Bug:
5430740
- Remove nonexistent names in PRODUCT_PACKAGES.
- Push down bluetooth-health, hostapd and wpa_supplicant.conf to
generic_no_telephony.mk and large_emu_hw.mk because they are not needed
by sdk builds.
- Remove core.mk from generic_armv5.mk and generic_x86.mk because they
already inherit from generic.mk.
Change-Id: Ie44b95f1cae7ed0d4cf827ffce6a91d41902434d
Ying Wang [Mon, 10 Oct 2011 16:54:47 +0000 (09:54 -0700)]
Remove PRODUCT_CONTRIBUTORS_FILE which is no longer in use.
Bug:
5433204
Change-Id: Id88c21f8d1991d8cbcc5bb7dae784aa72dc4becf
The Android Open Source Project [Mon, 10 Oct 2011 14:30:21 +0000 (07:30 -0700)]
am
2df17b45: Reconcile with ics-factoryrom-release
* commit '
2df17b458818b193660595bf967f0185fcabded6':
IFL09
IFL07B
The Android Open Source Project [Mon, 10 Oct 2011 14:27:25 +0000 (07:27 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: Ibd9094406b6984d8a27179eb934edc05d3a43321
The Android Automerger [Sun, 9 Oct 2011 20:31:47 +0000 (13:31 -0700)]
IFL09
The Android Automerger [Sun, 9 Oct 2011 20:28:28 +0000 (13:28 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Automerger [Sat, 8 Oct 2011 05:23:44 +0000 (22:23 -0700)]
IFL07B
The Android Automerger [Sat, 8 Oct 2011 05:22:43 +0000 (22:22 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Open Source Project [Sat, 8 Oct 2011 02:07:37 +0000 (19:07 -0700)]
am
226a54f0: Reconcile with ics-factoryrom-release
* commit '
226a54f03cb888e023e9df48b4041ee28135bf41':
IFL07
The Android Open Source Project [Sat, 8 Oct 2011 02:06:12 +0000 (19:06 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: I5b9b2250b49befd6afd87ed426c4883e006bf292
The Android Automerger [Sat, 8 Oct 2011 01:15:16 +0000 (18:15 -0700)]
IFL07
The Android Automerger [Sat, 8 Oct 2011 01:12:00 +0000 (18:12 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Open Source Project [Fri, 7 Oct 2011 12:46:51 +0000 (05:46 -0700)]
am
b606492a: Reconcile with honeycomb-LTE-release ics-factoryrom-release
* commit '
b606492a809ae0c23b17c24bd6b5930c3360eb98':
IFL06C
IFL06B
HLK75D
The Android Open Source Project [Fri, 7 Oct 2011 12:35:30 +0000 (05:35 -0700)]
Reconcile with honeycomb-LTE-release ics-factoryrom-release
Change-Id: I1a4e39e9520e2574fa8e4cdcf37c4c05a0017895
The Android Automerger [Fri, 7 Oct 2011 05:44:00 +0000 (22:44 -0700)]
IFL06C
The Android Automerger [Fri, 7 Oct 2011 05:43:40 +0000 (22:43 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Automerger [Fri, 7 Oct 2011 03:54:42 +0000 (20:54 -0700)]
IFL06B
The Android Automerger [Fri, 7 Oct 2011 03:51:13 +0000 (20:51 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Automerger [Fri, 7 Oct 2011 00:18:08 +0000 (17:18 -0700)]
HLK75D
The Android Open Source Project [Thu, 6 Oct 2011 14:46:22 +0000 (07:46 -0700)]
am
a570bde9: Reconcile with ics-factoryrom-release
* commit '
a570bde9f86b1a4f9293c5e8b87ef843bd38b124':
IFL06
The Android Open Source Project [Thu, 6 Oct 2011 14:45:19 +0000 (07:45 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: I6bcfc3069e62fe077704a9454abdd33e364cc637
The Android Automerger [Thu, 6 Oct 2011 14:28:47 +0000 (07:28 -0700)]
IFL06
The Android Automerger [Thu, 6 Oct 2011 14:21:34 +0000 (07:21 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Open Source Project [Thu, 6 Oct 2011 12:45:54 +0000 (05:45 -0700)]
am
42c37ba4: Reconcile with ics-factoryrom-release
* commit '
42c37ba41214d6aa4ce26d22a553cdd9f5d2da63':
IFL05C
The Android Open Source Project [Thu, 6 Oct 2011 12:44:04 +0000 (05:44 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: I7c2f0791fec871bd499afc9eaa41fd1dc55b91c5
The Android Automerger [Thu, 6 Oct 2011 02:00:34 +0000 (19:00 -0700)]
IFL05C
The Android Automerger [Thu, 6 Oct 2011 01:58:14 +0000 (18:58 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Open Source Project [Wed, 5 Oct 2011 23:17:32 +0000 (16:17 -0700)]
am
6fb71648: Reconcile with ics-factoryrom-release
* commit '
6fb71648db90753f51f95a51095ba01bcac185b2':
IFL05B
IFL05
The Android Open Source Project [Wed, 5 Oct 2011 23:15:57 +0000 (16:15 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: Ic9d7efb8cb6228820010bb55973cef63b93b8e65
The Android Automerger [Wed, 5 Oct 2011 23:09:01 +0000 (16:09 -0700)]
IFL05B
The Android Automerger [Wed, 5 Oct 2011 23:05:31 +0000 (16:05 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Scott Main [Wed, 5 Oct 2011 21:00:31 +0000 (14:00 -0700)]
am
23f66d09: Merge "docs: add ics logo for homepage"
* commit '
23f66d0927fc5098f380725af5c61faf3768e4fc':
docs: add ics logo for homepage
Scott Main [Wed, 5 Oct 2011 20:58:25 +0000 (13:58 -0700)]
Merge "docs: add ics logo for homepage"
Scott Main [Wed, 5 Oct 2011 20:53:36 +0000 (13:53 -0700)]
docs: add ics logo for homepage
Change-Id: I57504ce0919c88fd28ef550775b012b6c3d8498f
Doug Zongker [Wed, 5 Oct 2011 20:08:41 +0000 (13:08 -0700)]
am
68fbf0fa: am
49c6a2b5: fix build fingerprint: dev-keys vs test-keys
* commit '
68fbf0fa52ee5f749b8ec26dd71ed2f72aad37e0':
fix build fingerprint: dev-keys vs test-keys
Doug Zongker [Wed, 5 Oct 2011 20:06:30 +0000 (13:06 -0700)]
am
49c6a2b5: fix build fingerprint: dev-keys vs test-keys
* commit '
49c6a2b5e4314bd8acfbca88cd43ea49a2c8c30e':
fix build fingerprint: dev-keys vs test-keys
Doug Zongker [Wed, 5 Oct 2011 19:41:56 +0000 (12:41 -0700)]
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
Doug Zongker [Wed, 5 Oct 2011 18:34:10 +0000 (11:34 -0700)]
am
f41e67d8: am
ad4142cc: Merge "add missing parameter to ReplaceOtaKeys" into ics-factoryrom
* commit '
f41e67d82fd7bac695ecb0fbd70723c704a0aa9d':
add missing parameter to ReplaceOtaKeys
Doug Zongker [Wed, 5 Oct 2011 18:32:16 +0000 (11:32 -0700)]
am
ad4142cc: Merge "add missing parameter to ReplaceOtaKeys" into ics-factoryrom
* commit '
ad4142cce8e8a4fe8c9cbfe92a49428ea789986e':
add missing parameter to ReplaceOtaKeys
Doug Zongker [Wed, 5 Oct 2011 18:29:27 +0000 (11:29 -0700)]
Merge "add missing parameter to ReplaceOtaKeys" into ics-factoryrom
Doug Zongker [Wed, 5 Oct 2011 18:23:06 +0000 (11:23 -0700)]
add missing parameter to ReplaceOtaKeys
Change-Id: Ib596235a8e3b3588d363fea82b92b69895ee5408
Doug Zongker [Wed, 5 Oct 2011 16:59:40 +0000 (09:59 -0700)]
am
a4bbf24a: am
f9ede7e9: Merge "sign non-PRESIGNED prebuilt apks" into ics-factoryrom
* commit '
a4bbf24afde6288f5511fdb1f5600cafa27d9a93':
sign non-PRESIGNED prebuilt apks
Doug Zongker [Wed, 5 Oct 2011 16:58:05 +0000 (09:58 -0700)]
am
f9ede7e9: Merge "sign non-PRESIGNED prebuilt apks" into ics-factoryrom
* commit '
f9ede7e925a668cc8c0b44cb69c0795cb6c8c896':
sign non-PRESIGNED prebuilt apks
Doug Zongker [Wed, 5 Oct 2011 16:55:58 +0000 (09:55 -0700)]
Merge "sign non-PRESIGNED prebuilt apks" into ics-factoryrom
Doug Zongker [Wed, 5 Oct 2011 15:16:30 +0000 (08:16 -0700)]
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
Ying Wang [Wed, 5 Oct 2011 16:11:29 +0000 (09:11 -0700)]
am
5f61c302: am
0611aeed: Merge "Install path support for vendor modules." into ics-factoryrom
* commit '
5f61c30230b9392cedeca559b3112f807e117c0b':
Install path support for vendor modules.
Ying Wang [Wed, 5 Oct 2011 16:09:38 +0000 (09:09 -0700)]
am
0611aeed: Merge "Install path support for vendor modules." into ics-factoryrom
* commit '
0611aeedeb58bf4df1f1143f602aa64c8dbddc35':
Install path support for vendor modules.
Ying Wang [Wed, 5 Oct 2011 16:07:53 +0000 (09:07 -0700)]
Merge "Install path support for vendor modules." into ics-factoryrom
The Android Automerger [Wed, 5 Oct 2011 13:41:13 +0000 (06:41 -0700)]
IFL05
The Android Open Source Project [Wed, 5 Oct 2011 13:37:58 +0000 (06:37 -0700)]
am
fad908ee: Reconcile with ics-factoryrom-release
* commit '
fad908eeb1596392053ccc1f48792d5e4c9a14e4':
IFL04E
IFL04D
change OTA tools to handle variable dev keys
IFL04C
Support for product-specific dev keys.
IFL04B
The Android Automerger [Wed, 5 Oct 2011 13:37:40 +0000 (06:37 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Open Source Project [Wed, 5 Oct 2011 13:13:05 +0000 (06:13 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: I0889aad04af7434aa750ff2152a4ea7a0d0279e3
The Android Automerger [Wed, 5 Oct 2011 04:35:24 +0000 (21:35 -0700)]
IFL04E
The Android Automerger [Tue, 4 Oct 2011 23:30:32 +0000 (16:30 -0700)]
IFL04D
Doug Zongker [Thu, 22 Sep 2011 17:28:04 +0000 (10:28 -0700)]
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
The Android Automerger [Tue, 4 Oct 2011 23:17:19 +0000 (16:17 -0700)]
IFL04C
Ying Wang [Tue, 4 Oct 2011 17:50:08 +0000 (10:50 -0700)]
Support for product-specific dev keys.
Change-Id: Id577a72ee9f7cd70e8ca77efcbf10a37885c7d6f
Ed Heyl [Tue, 4 Oct 2011 23:16:38 +0000 (16:16 -0700)]
am
213c1f98: am
81703a19: Merge "Support for product-specific dev keys." into ics-factoryrom
* commit '
213c1f985daa159065ee41c4fc6ca4e1b8def189':
Support for product-specific dev keys.
Ed Heyl [Tue, 4 Oct 2011 23:15:25 +0000 (16:15 -0700)]
am
81703a19: Merge "Support for product-specific dev keys." into ics-factoryrom
* commit '
81703a19001ec219c35cb0ecf9bafb6e0dbc1e1d':
Support for product-specific dev keys.
Doug Zongker [Tue, 4 Oct 2011 23:14:57 +0000 (16:14 -0700)]
am
8fcea64b: am
831840e5: change OTA tools to handle variable dev keys
* commit '
8fcea64be068a8ba3ad9884a7089891a33197814':
change OTA tools to handle variable dev keys
Doug Zongker [Tue, 4 Oct 2011 23:13:47 +0000 (16:13 -0700)]
am
831840e5: change OTA tools to handle variable dev keys
* commit '
831840e51b0403671f746ebc32090b7d6e548c08':
change OTA tools to handle variable dev keys
Ed Heyl [Tue, 4 Oct 2011 23:13:38 +0000 (16:13 -0700)]
Merge "Support for product-specific dev keys." into ics-factoryrom
Doug Zongker [Thu, 22 Sep 2011 17:28:04 +0000 (10:28 -0700)]
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
Xavier Ducrohet [Tue, 4 Oct 2011 21:28:08 +0000 (14:28 -0700)]
am
54d34319: Merge "Put en_US as first product locale for SDK builds."
* commit '
54d34319d4d3d3e216b9fb68cd2117e9c0e17cca':
Put en_US as first product locale for SDK builds.
Xavier Ducrohet [Tue, 4 Oct 2011 21:26:08 +0000 (14:26 -0700)]
Merge "Put en_US as first product locale for SDK builds."
Xavier Ducrohet [Tue, 4 Oct 2011 21:20:56 +0000 (14:20 -0700)]
Put en_US as first product locale for SDK builds.
Change-Id: I7b6dfa066aca75ba8d315bddf2492f81311a7761
The Android Automerger [Tue, 4 Oct 2011 21:02:12 +0000 (14:02 -0700)]
IFL04B
The Android Open Source Project [Tue, 4 Oct 2011 20:59:17 +0000 (13:59 -0700)]
am
6b14da78: Reconcile with ics-factoryrom-release
* commit '
6b14da784aee9e3c3428561e269a521850449006':
IFL04
IFL03C
IFL03B
The Android Automerger [Tue, 4 Oct 2011 20:59:05 +0000 (13:59 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Open Source Project [Tue, 4 Oct 2011 20:56:38 +0000 (13:56 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: I223d353a699f6f258e2a2e47f81d528879c4381b
Ying Wang [Tue, 4 Oct 2011 17:50:08 +0000 (10:50 -0700)]
Support for product-specific dev keys.
Change-Id: Id577a72ee9f7cd70e8ca77efcbf10a37885c7d6f
Ying Wang [Tue, 4 Oct 2011 17:16:17 +0000 (10:16 -0700)]
am
12f60a5f: Merge "Enforce no prebuilt apks in PRODUCT_COPY_FILES."
* commit '
12f60a5f349b81ea720d347a51e6d68756a70200':
Enforce no prebuilt apks in PRODUCT_COPY_FILES.
Ying Wang [Tue, 4 Oct 2011 17:14:43 +0000 (10:14 -0700)]
Merge "Enforce no prebuilt apks in PRODUCT_COPY_FILES."
Xavier Ducrohet [Tue, 4 Oct 2011 16:00:39 +0000 (09:00 -0700)]
am
ad2a7a41: Also package xhdpi res in the SDK image.
* commit '
ad2a7a41755e9533d1005635177ef956c00bd89f':
Also package xhdpi res in the SDK image.
The Android Automerger [Tue, 4 Oct 2011 13:30:21 +0000 (06:30 -0700)]
IFL04
The Android Automerger [Tue, 4 Oct 2011 13:27:17 +0000 (06:27 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Xavier Ducrohet [Tue, 4 Oct 2011 02:42:07 +0000 (19:42 -0700)]
Also package xhdpi res in the SDK image.
Change-Id: I39977f70b63353d1d61bbbef6207973ba2876ff9
The Android Automerger [Mon, 3 Oct 2011 23:50:01 +0000 (16:50 -0700)]
IFL03C
The Android Automerger [Mon, 3 Oct 2011 23:49:41 +0000 (16:49 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Scott Main [Mon, 3 Oct 2011 22:47:00 +0000 (15:47 -0700)]
am
8e83353d: docs: fix visual bug in the search tabs. I assume this was introduced by a change in the CSE implementation
* commit '
8e83353d47e14cc555b5fa21e73b20f3d122afc0':
docs: fix visual bug in the search tabs. I assume this was introduced by a change in the CSE implementation
Scott Main [Mon, 3 Oct 2011 22:34:32 +0000 (15:34 -0700)]
docs: fix visual bug in the search tabs.
I assume this was introduced by a change in the CSE implementation
Change-Id: I776e385fd6c0d738a4bbf8372911b205c1f98123
The Android Automerger [Mon, 3 Oct 2011 21:55:41 +0000 (14:55 -0700)]
IFL03B
The Android Automerger [Mon, 3 Oct 2011 21:51:54 +0000 (14:51 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Scott Main [Mon, 3 Oct 2011 21:23:03 +0000 (14:23 -0700)]
am
bc547026: docs: add \'reference\' class for use with \'special\' to refine the headings used within the \'special\' div when in the reference.
* commit '
bc547026260010642804b5a72fc5ff0d1a9a9fd8':
docs: add 'reference' class for use with 'special' to refine the headings used within the 'special' div when in the reference.
Scott Main [Mon, 3 Oct 2011 20:01:43 +0000 (13:01 -0700)]
docs: add 'reference' class for use with 'special' to refine the headings
used within the 'special' div when in the reference.
Change-Id: Iebf84484e2eda104b2247aefc5a539f2a62c5102
The Android Open Source Project [Mon, 3 Oct 2011 15:29:20 +0000 (08:29 -0700)]
am
4b7294d0: Reconcile with ics-factoryrom-release
* commit '
4b7294d0b5765bf662e4b65396d9862d2a7c680e':
IFL03
The Android Open Source Project [Mon, 3 Oct 2011 14:41:03 +0000 (07:41 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: I51b4b8d176ec0513747cded7d63a45ab0c527abd
The Android Automerger [Mon, 3 Oct 2011 13:30:22 +0000 (06:30 -0700)]
IFL03
OSDN Git Service
