OSDN Git Service
The Android Open Source Project [Fri, 4 Nov 2011 14:58:25 +0000 (14:58 +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:48 +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
Dianne Hackborn [Wed, 2 Nov 2011 18:40:46 +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:21 +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
The Android Automerger [Wed, 2 Nov 2011 16:48:54 +0000 (09:48 -0700)]
merge in ics-factoryrom-2-release history after reset to ics-mr0
The Android Automerger [Wed, 2 Nov 2011 14:39:30 +0000 (07:39 -0700)]
ICL33B
The Android Automerger [Wed, 2 Nov 2011 14:38:38 +0000 (07:38 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Wed, 2 Nov 2011 13:29:49 +0000 (06:29 -0700)]
ICL33
The Android Automerger [Wed, 2 Nov 2011 13:27:20 +0000 (06:27 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Wed, 2 Nov 2011 12:20:59 +0000 (05:20 -0700)]
ITL33
The Android Automerger [Wed, 2 Nov 2011 11:07:50 +0000 (04:07 -0700)]
ITL33
The Android Open Source Project [Tue, 1 Nov 2011 21:31:03 +0000 (21:31 +0000)]
am
512879f4: Reconcile with ics-mr0-release
* commit '
512879f4c548233d14a2c9cf86a386574ae3d1b1':
ICL32B
ICL32
The Android Open Source Project [Tue, 1 Nov 2011 21:28:52 +0000 (14:28 -0700)]
Reconcile with ics-mr0-release
Change-Id: Ide415fc461dfd7d5899b51cb07f380e9ca95ed6b
The Android Open Source Project [Tue, 1 Nov 2011 17:11:59 +0000 (17:11 +0000)]
am
ab5b6ecd: am
5b85b190: Reconcile with ics-factoryrom-2-release
* commit '
ab5b6ecdde30cd86a01d21bd6aae003986f0df4c':
ITL31
The Android Open Source Project [Tue, 1 Nov 2011 17:10:36 +0000 (17:10 +0000)]
am
5b85b190: Reconcile with ics-factoryrom-2-release
* commit '
5b85b1900c9b58db7642db2d189766767fc259be':
ITL31
The Android Open Source Project [Tue, 1 Nov 2011 17:08:00 +0000 (10:08 -0700)]
Reconcile with ics-factoryrom-2-release
Change-Id: I5488896eaf252e88fd0a7c8052c1e27be3f91e6f
The Android Automerger [Tue, 1 Nov 2011 14:13:34 +0000 (07:13 -0700)]
ICL32B
The Android Automerger [Tue, 1 Nov 2011 14:12:37 +0000 (07:12 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Tue, 1 Nov 2011 13:29:20 +0000 (06:29 -0700)]
ICL32
The Android Automerger [Tue, 1 Nov 2011 13:27:11 +0000 (06:27 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Mon, 31 Oct 2011 23:41:16 +0000 (16:41 -0700)]
ITL31
Eric Fischer [Mon, 31 Oct 2011 23:27:27 +0000 (23:27 +0000)]
am
492ae873: Add Amharic and Hindi to the list of all locales.
* commit '
492ae8733e52cb3ef231113a8477c7b616ef10ce':
Add Amharic and Hindi to the list of all locales.
Eric Fischer [Mon, 31 Oct 2011 23:09:04 +0000 (16:09 -0700)]
Add Amharic and Hindi to the list of all locales.
Change-Id: I46d7b2c1e16edb7f96fd4be17fbe37b49b8658aa
The Android Open Source Project [Mon, 31 Oct 2011 20:08:16 +0000 (20:08 +0000)]
am
adb70c57: Reconcile with ics-mr0-release
* commit '
adb70c57c265f8e4e1f2306d5d91025a0683347e':
ICL31
ICL30
The Android Open Source Project [Mon, 31 Oct 2011 20:06:18 +0000 (13:06 -0700)]
Reconcile with ics-mr0-release
Change-Id: I7388dfaa2145b726609e8b30dea22740cd1b1d7b
The Android Open Source Project [Mon, 31 Oct 2011 19:47:56 +0000 (19:47 +0000)]
am
8bfe131e: am
db6281e8: Reconcile with ics-factoryrom-2-release
* commit '
8bfe131e2fec4af2f463f2e1915c49b5f38a5a4d':
ITL30B
ITL30
ITL28B
ITL28
The Android Open Source Project [Mon, 31 Oct 2011 19:45:30 +0000 (19:45 +0000)]
am
db6281e8: Reconcile with ics-factoryrom-2-release
* commit '
db6281e8bb5e258c8841c162ee9f34660912b13d':
ITL30B
ITL30
ITL28B
ITL28
The Android Open Source Project [Mon, 31 Oct 2011 19:43:34 +0000 (12:43 -0700)]
Reconcile with ics-factoryrom-2-release
Change-Id: I7f53fdbe6acf900cdd3322d238bf6fa659c95ff0
The Android Automerger [Mon, 31 Oct 2011 13:31:30 +0000 (06:31 -0700)]
ICL31
The Android Automerger [Mon, 31 Oct 2011 13:27:25 +0000 (06:27 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Sun, 30 Oct 2011 20:51:03 +0000 (13:51 -0700)]
ITL30B
The Android Automerger [Sun, 30 Oct 2011 19:35:43 +0000 (12:35 -0700)]
ITL30
The Android Automerger [Sun, 30 Oct 2011 19:34:39 +0000 (12:34 -0700)]
merge in ics-factoryrom-2-release history after reset to ics-mr0
The Android Automerger [Sun, 30 Oct 2011 13:32:02 +0000 (06:32 -0700)]
ICL30
The Android Automerger [Sun, 30 Oct 2011 13:27:17 +0000 (06:27 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Sat, 29 Oct 2011 06:24:05 +0000 (23:24 -0700)]
ITL28B
The Android Automerger [Sat, 29 Oct 2011 03:27:28 +0000 (20:27 -0700)]
ITL28
The Android Open Source Project [Fri, 28 Oct 2011 23:01:24 +0000 (23:01 +0000)]
am
5d8f09e5: Reconcile with ics-mr0-release
* commit '
5d8f09e5b36ba3ecee88cecb701ec526f0ac5398':
ICL28B
The Android Open Source Project [Fri, 28 Oct 2011 22:59:38 +0000 (15:59 -0700)]
Reconcile with ics-mr0-release
Change-Id: I8e45b4aba1157aec4a3d12cf9cd2b77610b677e9
The Android Automerger [Fri, 28 Oct 2011 20:47:54 +0000 (13:47 -0700)]
ICL28B
The Android Open Source Project [Fri, 28 Oct 2011 20:06:24 +0000 (20:06 +0000)]
am
0393a536: Reconcile with ics-mr0-release
* commit '
0393a5366e080dad0fec2e431a20ee34518f7bb5':
ICL28
ILC27B
ILC27B
ICL27B
ICL27
ICL26B
ICL26
ICL25B
ICL25
ICL24D
ICL24C
ICL24B
The Android Open Source Project [Fri, 28 Oct 2011 20:05:00 +0000 (13:05 -0700)]
Reconcile with ics-mr0-release
Change-Id: I531ca70758d587d3f5d540a033009e2dffeaf301
The Android Automerger [Fri, 28 Oct 2011 16:56:13 +0000 (09:56 -0700)]
ICL28
The Android Automerger [Fri, 28 Oct 2011 16:52:15 +0000 (09:52 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Open Source Project [Fri, 28 Oct 2011 16:46:52 +0000 (16:46 +0000)]
am
682967e1: am
d50bc1bb: Reconcile with ics-factoryrom-2-release
* commit '
682967e1eef28e5a4d8e0cc1076ef9d4be9bdfc5':
ITL27
ITL26B
The Android Open Source Project [Fri, 28 Oct 2011 16:45:28 +0000 (16:45 +0000)]
am
d50bc1bb: Reconcile with ics-factoryrom-2-release
* commit '
d50bc1bb3cd1ba5406dfc0b99bc3030bb8ae6ae3':
ITL27
ITL26B
The Android Open Source Project [Fri, 28 Oct 2011 16:43:52 +0000 (09:43 -0700)]
Reconcile with ics-factoryrom-2-release
Change-Id: Ieddd7ec26db003b46bfc01db728a5795cbff61ab
Jean-Baptiste Queru [Fri, 28 Oct 2011 15:27:07 +0000 (15:27 +0000)]
Jean-Baptiste Queru [Fri, 28 Oct 2011 15:25:49 +0000 (15:25 +0000)]
am
432f8d88: Reconcile with AOSP master
* commit '
432f8d881d22a4516aeac46fb0d80359a252d692':
HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE
Jean-Baptiste Queru [Fri, 28 Oct 2011 15:23:12 +0000 (08:23 -0700)]
Reconcile with AOSP master
Change-Id: I01bd9c391b6adaabbad233b308c5dbecfd9f2827
The Android Automerger [Fri, 28 Oct 2011 04:39:47 +0000 (21:39 -0700)]
ILC27B
The Android Automerger [Fri, 28 Oct 2011 02:48:00 +0000 (19:48 -0700)]
ILC27B
The Android Automerger [Fri, 28 Oct 2011 02:31:15 +0000 (19:31 -0700)]
ITL27
The Android Automerger [Fri, 28 Oct 2011 02:29:34 +0000 (19:29 -0700)]
merge in ics-factoryrom-2-release history after reset to ics-mr0
The Android Automerger [Fri, 28 Oct 2011 00:47:07 +0000 (17:47 -0700)]
ICL27B
Jim Huang [Thu, 27 Oct 2011 21:09:17 +0000 (21:09 +0000)]
am
fddf23f1: HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE
* commit '
fddf23f19e7604e6c5b3c5377e7ff6293539a1da':
HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE
Jim Huang [Tue, 6 Sep 2011 17:25:28 +0000 (01:25 +0800)]
HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE
While building Android with latest host gcc, it causes the following
build error:
Install: out/host/linux-x86/bin/mkbootimg
host C++: obbtool <= frameworks/base/tools/obbtool/Main.cpp
<command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror]
<built-in>:0:0: note: this is the location of the previous definition
cc1plus: all warnings being treated as errors
In order to make build system happy, this patch does unset macro
_FORTIFY_SOURCE and then define it in host cflags.
Change-Id: Ic37a90f05081a2c3650b3335bc87e9e895900fb2
The Android Automerger [Thu, 27 Oct 2011 13:29:39 +0000 (06:29 -0700)]
ICL27
The Android Automerger [Thu, 27 Oct 2011 13:27:10 +0000 (06:27 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Ed Heyl [Thu, 27 Oct 2011 09:08:07 +0000 (09:08 +0000)]
ITL26B
Change-Id: I1ab93cc9a63d5873bc4aecc17a45f474828dc981
Ying Wang [Thu, 27 Oct 2011 04:04:50 +0000 (04:04 +0000)]
am
b3e6fa5e: Merge "new LOCAL_DEX_PREOPT option "nostripping"" into ics-mr0
* commit '
b3e6fa5e6bdaf6e1e827c3e79ffda1ef796b3a1b':
new LOCAL_DEX_PREOPT option "nostripping"
Ying Wang [Thu, 27 Oct 2011 04:04:01 +0000 (21:04 -0700)]
Merge "new LOCAL_DEX_PREOPT option "nostripping"" into ics-mr0
Jeff Davidson [Thu, 27 Oct 2011 02:53:26 +0000 (02:53 +0000)]
am
033fbe28: Support signing target_files without a recovery.fstab.
* commit '
033fbe28c273fc5a99e0738d84c79ee7040b1fa0':
Support signing target_files without a recovery.fstab.
Jeff Davidson [Thu, 27 Oct 2011 01:08:09 +0000 (18:08 -0700)]
Support signing target_files without a recovery.fstab.
Change-Id: I7d6f511c69d589bf035ac3eb7eeee4b0e0505faa
The Android Automerger [Wed, 26 Oct 2011 23:30:12 +0000 (16:30 -0700)]
ICL26B
The Android Automerger [Wed, 26 Oct 2011 23:26:04 +0000 (16:26 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Scott Main [Wed, 26 Oct 2011 20:17:45 +0000 (20:17 +0000)]
am
8bb6ea59: Merge "docs: add new style for adding "deprecated" messages to dev guides" into ics-mr0
* commit '
8bb6ea5995a30df8fb94bbfa041094a5f224321c':
docs: add new style for adding "deprecated" messages to dev guides
Scott Main [Wed, 26 Oct 2011 20:16:13 +0000 (13:16 -0700)]
Merge "docs: add new style for adding "deprecated" messages to dev guides" into ics-mr0
The Android Automerger [Wed, 26 Oct 2011 13:30:20 +0000 (06:30 -0700)]
ICL26
The Android Automerger [Wed, 26 Oct 2011 13:27:12 +0000 (06:27 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Tue, 25 Oct 2011 19:48:34 +0000 (12:48 -0700)]
ICL25B
The Android Automerger [Tue, 25 Oct 2011 19:46:30 +0000 (12:46 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Ed Heyl [Tue, 25 Oct 2011 14:23:21 +0000 (07:23 -0700)]
set ID to MR1. Please do not merge.
Change-Id: Ib181d19806a2589ec124b648e2d12c5350b0ce81
The Android Automerger [Tue, 25 Oct 2011 13:29:04 +0000 (06:29 -0700)]
ICL25
The Android Automerger [Tue, 25 Oct 2011 13:27:15 +0000 (06:27 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Tue, 25 Oct 2011 03:32:11 +0000 (20:32 -0700)]
ICL24D
The Android Automerger [Tue, 25 Oct 2011 03:27:23 +0000 (20:27 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Scott Main [Mon, 24 Oct 2011 23:45:58 +0000 (16:45 -0700)]
docs: add new style for adding "deprecated" messages to dev guides
Change-Id: I0d690a6c0880343919114370331b7c2756b6a50e
The Android Automerger [Mon, 24 Oct 2011 21:55:52 +0000 (14:55 -0700)]
ICL24C
The Android Automerger [Mon, 24 Oct 2011 21:53:34 +0000 (14:53 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Mon, 24 Oct 2011 19:57:49 +0000 (12:57 -0700)]
ICL24B
The Android Automerger [Mon, 24 Oct 2011 19:54:59 +0000 (12:54 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Ying Wang [Mon, 24 Oct 2011 19:17:03 +0000 (12:17 -0700)]
new LOCAL_DEX_PREOPT option "nostripping"
Set "LOCAL_DEX_PREOPT := nostripping" to do dex-preopt while not strip
the classes.dex.
Bug:
5396625 5502338
Change-Id: Ie8dea4414ebeefeae89c6433b246faea27baa5e7
The Android Open Source Project [Mon, 24 Oct 2011 13:32:01 +0000 (06:32 -0700)]
Reconcile with ics-factoryrom-release ics-mr0-release
Change-Id: Ib5fff2dcdcfd889d707ff2eef25ba806e22f8b85
The Android Automerger [Mon, 24 Oct 2011 13:28:08 +0000 (06:28 -0700)]
ICL24
The Android Automerger [Mon, 24 Oct 2011 13:27:09 +0000 (06:27 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
OSDN Git Service
