OSDN Git Service
Bart Sears [Mon, 21 Nov 2011 16:31:50 +0000 (08:31 -0800)]
am
bb0e59be: resolved conflicts for merge of
aca203ff to ics-mr1
* commit '
bb0e59be7c01fd9eb85d81b92c0527bac5402d1d':
ICS MR0.1 will be version 4.0.2 - do not merge
Bart Sears [Mon, 21 Nov 2011 05:03:42 +0000 (21:03 -0800)]
resolved conflicts for merge of
aca203ff to ics-mr1
Change-Id: Ib073a84132feb8eacaeb5af45ffa504102165149
Bart Sears [Sat, 19 Nov 2011 00:39:59 +0000 (16:39 -0800)]
ICS MR0.1 will be version 4.0.2 - do not merge
Change-Id: I35db6befcdfc421da8eb959285e61856c7ed2826
The Android Open Source Project [Fri, 18 Nov 2011 23:51:12 +0000 (15:51 -0800)]
am
1ca1730b: Reconcile with ics-mr0-release
* commit '
1ca1730b88e45d39c9211793d133cae148b134a1':
ICL49
The Android Open Source Project [Fri, 18 Nov 2011 23:49:35 +0000 (15:49 -0800)]
Reconcile with ics-mr0-release
Change-Id: I134c060024841405d83b92a700bfe05aeb5d86b5
The Android Automerger [Fri, 18 Nov 2011 23:38:37 +0000 (15:38 -0800)]
ICL49
The Android Automerger [Fri, 18 Nov 2011 23:36:30 +0000 (15:36 -0800)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Open Source Project [Fri, 18 Nov 2011 21:14:14 +0000 (13:14 -0800)]
am
409670e9: Reconcile with ics-mr0-release
* commit '
409670e9fa4131bed57a292b3a25180e4ac0709e':
ICL48B
The Android Open Source Project [Fri, 18 Nov 2011 21:12:21 +0000 (13:12 -0800)]
Reconcile with ics-mr0-release
Change-Id: I1a7eeaede99ffa7bb7f38ee419704ab9d1f2d834
Svetoslav Ganov [Fri, 18 Nov 2011 18:13:49 +0000 (10:13 -0800)]
am
700b18cc: Merge "Add the support libraries to the platform documentation (build)." into ics-mr1
* commit '
700b18cc72e75737fa5cf79896c98f12003b7735':
Add the support libraries to the platform documentation (build).
Svetoslav Ganov [Fri, 18 Nov 2011 18:11:28 +0000 (10:11 -0800)]
Merge "Add the support libraries to the platform documentation (build)." into ics-mr1
The Android Automerger [Fri, 18 Nov 2011 01:50:39 +0000 (17:50 -0800)]
ICL48B
The Android Automerger [Fri, 18 Nov 2011 01:47:41 +0000 (17:47 -0800)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Open Source Project [Fri, 18 Nov 2011 00:03:53 +0000 (16:03 -0800)]
am
77b2771b: Reconcile with ics-mr0-release
* commit '
77b2771bd2bc26aefdf9ff3a3d96b54799185917':
ICL48
The Android Open Source Project [Thu, 17 Nov 2011 23:36:45 +0000 (15:36 -0800)]
Reconcile with ics-mr0-release
Change-Id: I42fcd347d98058118f225dedd011cb2fac76bbb6
Svetoslav Ganov [Thu, 17 Nov 2011 23:13:49 +0000 (15:13 -0800)]
Add the support libraries to the platform documentation (build).
Added path to the support libraries.
bug:
5629339
Change-Id: Id414597046c528617313881ea857134512d1c2ba
The Android Automerger [Thu, 17 Nov 2011 14:29:27 +0000 (06:29 -0800)]
ICL48
The Android Automerger [Thu, 17 Nov 2011 14:27:12 +0000 (06:27 -0800)]
merge in ics-mr0-release history after reset to ics-mr0
Ying Wang [Wed, 16 Nov 2011 19:56:30 +0000 (11:56 -0800)]
Remove BUILT_TESTS_ZIP_PACKAGE's dependency on the image files
Change-Id: I99baaeffe099e8fbb9789fb01b26a9a563e1e90d
Ying Wang [Wed, 16 Nov 2011 19:12:41 +0000 (11:12 -0800)]
Don't build userdata.img for tests build.
Change-Id: I2982223919267f7b98f47b002c435e443674729a
The Android Open Source Project [Wed, 16 Nov 2011 17:13:36 +0000 (09:13 -0800)]
The Android Open Source Project [Wed, 16 Nov 2011 17:10:21 +0000 (09:10 -0800)]
No-op merge from ics-mr0
Change-Id: Ibbdd04c5626976293b9e6170e9e1f844cb6582a5
The Android Open Source Project [Wed, 16 Nov 2011 16:55:32 +0000 (08:55 -0800)]
Reconcile with ics-factoryrom-2-release
Change-Id: I2059be2fb54d852023cb4e4b96493ff6a934ffe0
The Android Open Source Project [Wed, 16 Nov 2011 15:38:39 +0000 (07:38 -0800)]
am
88eff0cb: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit '
88eff0cb509bdd824c542b52880d9e93db4444a0':
ICL47
ICL46B
ICL46
ICL45B
ICL45
ICL44
ITL41D
ICL42C
ICL42B
ICL42
ITL41C
ITL41B
ITL41
ICL41
The Android Open Source Project [Wed, 16 Nov 2011 15:33:52 +0000 (07:33 -0800)]
Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: I76232373a2c25c0e18c27672ede2bb1b281e43f6
The Android Automerger [Wed, 16 Nov 2011 14:28:22 +0000 (06:28 -0800)]
ICL47
The Android Automerger [Wed, 16 Nov 2011 14:27:06 +0000 (06:27 -0800)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Wed, 16 Nov 2011 03:09:18 +0000 (19:09 -0800)]
ICL46B
The Android Automerger [Wed, 16 Nov 2011 03:07:30 +0000 (19:07 -0800)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Tue, 15 Nov 2011 14:28:19 +0000 (06:28 -0800)]
ICL46
The Android Automerger [Tue, 15 Nov 2011 14:27:08 +0000 (06:27 -0800)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Tue, 15 Nov 2011 01:14:35 +0000 (17:14 -0800)]
ICL45B
The Android Automerger [Tue, 15 Nov 2011 01:10:28 +0000 (17:10 -0800)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Mon, 14 Nov 2011 14:28:30 +0000 (06:28 -0800)]
ICL45
The Android Automerger [Mon, 14 Nov 2011 14:27:06 +0000 (06:27 -0800)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Sun, 13 Nov 2011 14:28:49 +0000 (06:28 -0800)]
ICL44
The Android Automerger [Sun, 13 Nov 2011 14:27:17 +0000 (06:27 -0800)]
merge in ics-mr0-release history after reset to ics-mr0
Doug Zongker [Sat, 12 Nov 2011 04:34:28 +0000 (20:34 -0800)]
am
4a84a13e: am
a5f534df: use frozensets to represent APK cert sets
* commit '
4a84a13e7ce65f24bcadb8d331023b6415d7867e':
use frozensets to represent APK cert sets
Doug Zongker [Sat, 12 Nov 2011 03:17:24 +0000 (19:17 -0800)]
am
a5f534df: use frozensets to represent APK cert sets
* commit '
a5f534df07a598f3fc9d353a1a9a0ff6c09cfbc0':
use frozensets to represent APK cert sets
The Android Automerger [Sat, 12 Nov 2011 03:08:23 +0000 (19:08 -0800)]
ITL41D
The Android Automerger [Sat, 12 Nov 2011 02:47:45 +0000 (18:47 -0800)]
ICL42C
The Android Automerger [Sat, 12 Nov 2011 02:33:07 +0000 (18:33 -0800)]
ICL42B
The Android Automerger [Fri, 11 Nov 2011 22:47:46 +0000 (14:47 -0800)]
ICL42
The Android Automerger [Fri, 11 Nov 2011 22:45:37 +0000 (14:45 -0800)]
merge in ics-mr0-release history after reset to ics-mr0
Ying Wang [Fri, 11 Nov 2011 22:36:17 +0000 (14:36 -0800)]
am
a032d3d0: Support for multiple PRODUCT_SDK_ADDON_DOC_MODULES
* commit '
a032d3d07372423176e072dfcbcf60a53f8a7d57':
Support for multiple PRODUCT_SDK_ADDON_DOC_MODULES
Ying Wang [Fri, 11 Nov 2011 18:52:12 +0000 (10:52 -0800)]
Support for multiple PRODUCT_SDK_ADDON_DOC_MODULES
Bug:
5429077
Change-Id: I8d962c803496479ba5b5e7316538aced65ee4df1
Doug Zongker [Fri, 11 Nov 2011 17:51:37 +0000 (09:51 -0800)]
use frozensets to represent APK cert sets
Change-Id: Ic92c83be0c3f6a76bf1bd21f0216cd1b87586959
The Android Automerger [Fri, 11 Nov 2011 07:41:40 +0000 (23:41 -0800)]
ITL41C
The Android Automerger [Fri, 11 Nov 2011 01:27:13 +0000 (17:27 -0800)]
ITL41B
The Android Automerger [Fri, 11 Nov 2011 01:22:24 +0000 (17:22 -0800)]
ITL41
The Android Automerger [Thu, 10 Nov 2011 14:29:30 +0000 (06:29 -0800)]
ICL41
The Android Automerger [Thu, 10 Nov 2011 14:27:22 +0000 (06:27 -0800)]
merge in ics-mr0-release history after reset to ics-mr0
Doug Zongker [Wed, 9 Nov 2011 19:05:30 +0000 (19:05 +0000)]
am
4b87f575: am
278c9781: to be upgraded, APKs must have exactly the same set of certs
* commit '
4b87f575d45320260e35f224cd18f36eec5e3eb2':
to be upgraded, APKs must have exactly the same set of certs
Doug Zongker [Wed, 9 Nov 2011 19:02:26 +0000 (19:02 +0000)]
am
278c9781: to be upgraded, APKs must have exactly the same set of certs
* commit '
278c9781ec5d2ef289fee635dfcfd8befcfe531b':
to be upgraded, APKs must have exactly the same set of certs
The Android Open Source Project [Wed, 9 Nov 2011 19:00:42 +0000 (19:00 +0000)]
am
2cc72714: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit '
2cc727144133b71534d3654bfd00f62a4ac353b1':
ICL40
ITL39B
ITL39
Doug Zongker [Wed, 9 Nov 2011 18:32:23 +0000 (10:32 -0800)]
to be upgraded, APKs must have exactly the same set of certs
Change-Id: I0d528d3d55e5ee553e57e63ed1f998172c6306f8
The Android Open Source Project [Wed, 9 Nov 2011 17:00:36 +0000 (09:00 -0800)]
Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: I85230491012b7871cedf93197c74d4b898d79bdf
The Android Open Source Project [Wed, 9 Nov 2011 14:36:58 +0000 (14:36 +0000)]
am
5f213f55: Reconcile with ics-mr0-release
* commit '
5f213f5533d7c8871713fe25680d9ab37853792d':
ICL39
The Android Automerger [Wed, 9 Nov 2011 14:29:32 +0000 (06:29 -0800)]
ICL40
The Android Automerger [Wed, 9 Nov 2011 14:27:19 +0000 (06:27 -0800)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Wed, 9 Nov 2011 01:27:00 +0000 (17:27 -0800)]
ITL39B
The Android Automerger [Tue, 8 Nov 2011 19:41:56 +0000 (11:41 -0800)]
ITL39
The Android Open Source Project [Tue, 8 Nov 2011 19:07:58 +0000 (11:07 -0800)]
Reconcile with ics-mr0-release
Change-Id: Ie500b6cd75e6020240031cd70aadb1b921ed3318
The Android Automerger [Tue, 8 Nov 2011 14:41:55 +0000 (06:41 -0800)]
ICL39
The Android Automerger [Tue, 8 Nov 2011 14:39:48 +0000 (06:39 -0800)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Open Source Project [Mon, 7 Nov 2011 17:37:10 +0000 (17:37 +0000)]
am
55f675e9: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit '
55f675e98ee93e6cb122796322846c6b12e066f3':
ICL38
ICL37
ICL36
ITL35B
ICL35
ITL35
Fix missing SW h264 decoder and remove the non-existing SW avc decoder in product PRODUCT_PACKAGES
The Android Open Source Project [Mon, 7 Nov 2011 16:22:45 +0000 (08:22 -0800)]
Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: Ia7bf3982d1a8fe4e1a5c458849250c38f65a6d50
The Android Automerger [Mon, 7 Nov 2011 14:28:08 +0000 (06:28 -0800)]
ICL38
The Android Automerger [Mon, 7 Nov 2011 14:27:05 +0000 (06:27 -0800)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Sun, 6 Nov 2011 14:28:42 +0000 (06:28 -0800)]
ICL37
The Android Automerger [Sun, 6 Nov 2011 14:27:06 +0000 (06:27 -0800)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Sat, 5 Nov 2011 07:33:42 +0000 (00:33 -0700)]
ICL36
The Android Automerger [Sat, 5 Nov 2011 07:32:23 +0000 (00:32 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Sat, 5 Nov 2011 05:19:16 +0000 (22:19 -0700)]
ITL35B
The Android Automerger [Fri, 4 Nov 2011 22:42:21 +0000 (15:42 -0700)]
ICL35
The Android Automerger [Fri, 4 Nov 2011 22:38:52 +0000 (15:38 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Fri, 4 Nov 2011 22:18:00 +0000 (15:18 -0700)]
ITL35
James Dong [Fri, 4 Nov 2011 20:55:01 +0000 (13:55 -0700)]
Fix missing SW h264 decoder and remove the non-existing SW avc decoder in product PRODUCT_PACKAGES
Change-Id: I93bcf983f5f4da2d37c0f2186a04e7c197ef56a4
related-to-bug:
5566262
James Dong [Fri, 4 Nov 2011 21:40:42 +0000 (21:40 +0000)]
am
ee3c1619: am
ddc943da: Fix missing SW h264 decoder and remove the non-existing SW avc decoder in product PRODUCT_PACKAGES
* commit '
ee3c16196b2f2b67ff891b94d260f0c301f941c0':
Fix missing SW h264 decoder and remove the non-existing SW avc decoder in product PRODUCT_PACKAGES
James Dong [Fri, 4 Nov 2011 21:39:10 +0000 (21:39 +0000)]
am
ddc943da: Fix missing SW h264 decoder and remove the non-existing SW avc decoder in product PRODUCT_PACKAGES
* commit '
ddc943da7e27d745517c50738c249b567970350e':
Fix missing SW h264 decoder and remove the non-existing SW avc decoder in product PRODUCT_PACKAGES
James Dong [Fri, 4 Nov 2011 20:55:01 +0000 (13:55 -0700)]
Fix missing SW h264 decoder and remove the non-existing SW avc decoder in product PRODUCT_PACKAGES
Change-Id: I93bcf983f5f4da2d37c0f2186a04e7c197ef56a4
related-to-bug:
5566262
The Android Open Source Project [Fri, 4 Nov 2011 14:57:53 +0000 (14:57 +0000)]
am
76d6da3e: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit '
76d6da3edd25918d334d598845dc83ed7cc225e2':
ITL34B
ITL34
ICL34
ITL33D
ITL33C
The Android Open Source Project [Fri, 4 Nov 2011 14:56:37 +0000 (07:56 -0700)]
Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: Ib37c1f38b47fe5c92f34b5587acd5e67a083f9a3
The Android Automerger [Fri, 4 Nov 2011 04:03:44 +0000 (21:03 -0700)]
ITL34B
Brian Muramatsu [Thu, 3 Nov 2011 19:57:13 +0000 (19:57 +0000)]
am
e43794ac: am
277be2fe: Stop Packaging Old CTS Test Runner Files
* commit '
e43794ace2a32cff6b1896981ba8bd3a7fa9f562':
Stop Packaging Old CTS Test Runner Files
Brian Muramatsu [Thu, 3 Nov 2011 19:56:00 +0000 (19:56 +0000)]
am
277be2fe: Stop Packaging Old CTS Test Runner Files
* commit '
277be2fe0cfcb31c34ad3426a1ab8df9b8cde6cb':
Stop Packaging Old CTS Test Runner Files
The Android Automerger [Thu, 3 Nov 2011 19:35:16 +0000 (12:35 -0700)]
ITL34
Brian Muramatsu [Thu, 3 Nov 2011 18:34:06 +0000 (11:34 -0700)]
Stop Packaging Old CTS Test Runner Files
Bug
5563917
This stops packaging the startcts script and the cts.jar into
the android-cts.zip. Since we are only testing using Tradefed,
we should prevent confusion by removing the old test runner.
Change-Id: I79f991617dd9e6a51a314207b4727cce3136d60f
The Android Automerger [Thu, 3 Nov 2011 13:35:26 +0000 (06:35 -0700)]
ICL34
The Android Automerger [Thu, 3 Nov 2011 13:32:09 +0000 (06:32 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Thu, 3 Nov 2011 04:22:44 +0000 (21:22 -0700)]
ITL33D
The Android Automerger [Thu, 3 Nov 2011 03:54:15 +0000 (20:54 -0700)]
ITL33C
The Android Automerger [Thu, 3 Nov 2011 03:52:48 +0000 (20:52 -0700)]
merge in ics-factoryrom-2-release history after reset to ics-mr0
Ying Wang [Wed, 2 Nov 2011 20:49:08 +0000 (13:49 -0700)]
Allow to set ANDROID_BUILDSPEC as path of buildspec.mk
So that clients can set a custom buildspec.mk without adding
buildspec.mk at the top dir.
Change-Id: I4d993e24cea19caffdfe85822cdfdb9483cdfce7
Dianne Hackborn [Wed, 2 Nov 2011 18:40:04 +0000 (18:40 +0000)]
am
1b601a44: Merge "MR1 is version 4.1, API 15." into ics-mr1
* commit '
1b601a447247bcc373d417d7be4c89c1e6216b89':
MR1 is version 4.1, API 15.
Dianne Hackborn [Wed, 2 Nov 2011 18:38:37 +0000 (11:38 -0700)]
Merge "MR1 is version 4.1, API 15." into ics-mr1
Dianne Hackborn [Wed, 2 Nov 2011 01:15:57 +0000 (18:15 -0700)]
MR1 is version 4.1, API 15.
Change-Id: I5f31630b17121ce43b3c60d43409069640e4d97a
The Android Open Source Project [Wed, 2 Nov 2011 17:54:47 +0000 (17:54 +0000)]
am
3bd8e467: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit '
3bd8e467d7cd40c20f95fbf50de8f926ba301cb3':
ITL33B
ICL33B
ICL33
ITL33
ITL33
The Android Open Source Project [Wed, 2 Nov 2011 17:52:42 +0000 (10:52 -0700)]
Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: Ifc368f50826b4d4bc955457e0cc370fc9e10e459
The Android Automerger [Wed, 2 Nov 2011 16:49:00 +0000 (09:49 -0700)]
ITL33B