Commit graph

7358 commits

Author SHA1 Message Date
The Android Automerger
772acb1f68 ICL39 2011-11-08 06:41:55 -08:00
The Android Automerger
06a77023b8 merge in ics-mr0-release history after reset to ics-mr0 2011-11-08 06:39:48 -08:00
The Android Automerger
f6d868b5f3 IML38B 2011-11-07 14:55:07 -08:00
The Android Open Source Project
55f675e98e Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: Ia7bf3982d1a8fe4e1a5c458849250c38f65a6d50
2011-11-07 08:22:45 -08:00
The Android Automerger
441bd3de1c IML38 2011-11-07 06:47:11 -08:00
The Android Automerger
bb69bfa29c merge in ics-mr1-release history after reset to ics-mr1 2011-11-07 06:45:11 -08:00
The Android Automerger
2fc572383c ICL38 2011-11-07 06:28:08 -08:00
The Android Automerger
132643b551 merge in ics-mr0-release history after reset to ics-mr0 2011-11-07 06:27:05 -08:00
The Android Automerger
523c5f7724 IML37 2011-11-06 06:48:33 -08:00
The Android Automerger
b1554e61eb merge in ics-mr1-release history after reset to ics-mr1 2011-11-06 06:45:16 -08:00
The Android Automerger
b577e85cd3 ICL37 2011-11-06 06:28:42 -08:00
The Android Automerger
0fe13345db merge in ics-mr0-release history after reset to ics-mr0 2011-11-06 06:27:06 -08:00
The Android Automerger
c2f9b68416 ICL36 2011-11-05 00:33:42 -07:00
The Android Automerger
0769335ad0 merge in ics-mr0-release history after reset to ics-mr0 2011-11-05 00:32:23 -07:00
The Android Automerger
9c72360185 ITL35B 2011-11-04 22:19:16 -07:00
The Android Automerger
dcfe107755 ICL35 2011-11-04 15:42:21 -07:00
The Android Automerger
35f2111d4e merge in ics-mr0-release history after reset to ics-mr0 2011-11-04 15:38:52 -07:00
The Android Automerger
d6386eb7ab ITL35 2011-11-04 15:18:00 -07:00
James Dong
9f78b403c6 Fix missing SW h264 decoder and remove the non-existing SW avc decoder in product PRODUCT_PACKAGES
Change-Id: I93bcf983f5f4da2d37c0f2186a04e7c197ef56a4

related-to-bug: 5566262
2011-11-04 15:17:47 -07:00
James Dong
ee3c16196b 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
2011-11-04 21:39:10 +00:00
James Dong
ddc943da7e Fix missing SW h264 decoder and remove the non-existing SW avc decoder in product PRODUCT_PACKAGES
Change-Id: I93bcf983f5f4da2d37c0f2186a04e7c197ef56a4

related-to-bug: 5566262
2011-11-04 14:08:36 -07:00
The Android Open Source Project
76d6da3edd Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: Ib37c1f38b47fe5c92f34b5587acd5e67a083f9a3
2011-11-04 07:56:38 -07:00
The Android Automerger
3d8ebbe242 IML34B 2011-11-03 21:12:34 -07:00
The Android Automerger
03f71fcac8 ITL34B 2011-11-03 21:03:44 -07:00
Brian Muramatsu
e43794ace2 am 277be2fe: Stop Packaging Old CTS Test Runner Files
* commit '277be2fe0cfcb31c34ad3426a1ab8df9b8cde6cb':
  Stop Packaging Old CTS Test Runner Files
2011-11-03 19:56:00 +00:00
The Android Automerger
441dd497c4 ITL34 2011-11-03 12:35:16 -07:00
Brian Muramatsu
277be2fe0c 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
2011-11-03 11:42:39 -07:00
The Android Automerger
e43361e82c IML34 2011-11-03 06:46:08 -07:00
The Android Automerger
850f977383 merge in ics-mr1-release history after reset to ics-mr1 2011-11-03 06:43:27 -07:00
The Android Automerger
b618db4839 ICL34 2011-11-03 06:35:26 -07:00
The Android Automerger
a3041a8248 merge in ics-mr0-release history after reset to ics-mr0 2011-11-03 06:32:09 -07:00
The Android Automerger
7ce887dba3 ITL33D 2011-11-02 21:22:44 -07:00
The Android Automerger
0754c0b350 ITL33C 2011-11-02 20:54:15 -07:00
The Android Automerger
2873345f4c merge in ics-factoryrom-2-release history after reset to ics-mr0 2011-11-02 20:52:48 -07:00
The Android Automerger
29c554f5cc IML33C 2011-11-02 16:13:27 -07:00
Dianne Hackborn
1b601a4472 Merge "MR1 is version 4.1, API 15." into ics-mr1 2011-11-02 11:38:37 -07:00
Dianne Hackborn
b32faad390 MR1 is version 4.1, API 15.
Change-Id: I5f31630b17121ce43b3c60d43409069640e4d97a
2011-11-02 11:37:25 -07:00
The Android Open Source Project
3bd8e467d7 Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: Ifc368f50826b4d4bc955457e0cc370fc9e10e459
2011-11-02 10:52:42 -07:00
The Android Automerger
b3eb60142e ITL33B 2011-11-02 09:49:00 -07:00
The Android Automerger
9a252144d5 merge in ics-factoryrom-2-release history after reset to ics-mr0 2011-11-02 09:48:54 -07:00
The Android Automerger
beaeeab3a4 IML33B 2011-11-02 07:46:08 -07:00
The Android Automerger
3f33e342c3 merge in ics-mr1-release history after reset to ics-mr1 2011-11-02 07:44:58 -07:00
The Android Automerger
9190102040 ICL33B 2011-11-02 07:39:30 -07:00
The Android Automerger
c5dcbaaea6 merge in ics-mr0-release history after reset to ics-mr0 2011-11-02 07:38:38 -07:00
The Android Automerger
f33a8509eb IML33 2011-11-02 06:48:34 -07:00
The Android Automerger
0073665d63 merge in ics-mr1-release history after reset to ics-mr1 2011-11-02 06:45:15 -07:00
The Android Automerger
4f43e33761 ICL33 2011-11-02 06:29:49 -07:00
The Android Automerger
15584c2e9b merge in ics-mr0-release history after reset to ics-mr0 2011-11-02 06:27:20 -07:00
The Android Automerger
e4042173c7 ITL33 2011-11-02 05:20:59 -07:00
The Android Automerger
0e0c7477c8 ITL33 2011-11-02 04:07:50 -07:00