OSDN Git Service
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 [Mon, 31 Oct 2011 23:41:16 +0000 (16:41 -0700)]
ITL31
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:06:18 +0000 (13:06 -0700)]
Reconcile with ics-mr0-release
Change-Id: I7388dfaa2145b726609e8b30dea22740cd1b1d7b
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 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: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: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: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 [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
The Android Automerger [Sun, 23 Oct 2011 23:45:00 +0000 (16:45 -0700)]
ICL23D
The Android Automerger [Sun, 23 Oct 2011 23:44:57 +0000 (16:44 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Sun, 23 Oct 2011 23:33:06 +0000 (16:33 -0700)]
ICL23C
The Android Automerger [Sun, 23 Oct 2011 23:32:11 +0000 (16:32 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Sun, 23 Oct 2011 18:41:30 +0000 (11:41 -0700)]
ICL23B
The Android Automerger [Sun, 23 Oct 2011 18:40:31 +0000 (11:40 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Sun, 23 Oct 2011 13:28:10 +0000 (06:28 -0700)]
ICL23
The Android Automerger [Sun, 23 Oct 2011 13:27:06 +0000 (06:27 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Sat, 22 Oct 2011 23:57:57 +0000 (16:57 -0700)]
ICL22
The Android Automerger [Sat, 22 Oct 2011 23:56:22 +0000 (16:56 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Sat, 22 Oct 2011 06:26:12 +0000 (23:26 -0700)]
ICL21C
The Android Automerger [Sat, 22 Oct 2011 06:21:56 +0000 (23:21 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Sat, 22 Oct 2011 00:04:05 +0000 (17:04 -0700)]
ICL21B
Chia-chi Yeh [Fri, 21 Oct 2011 23:45:29 +0000 (16:45 -0700)]
Merge "Move VpnDialogs into core.mk."
Chia-chi Yeh [Fri, 21 Oct 2011 20:59:46 +0000 (13:59 -0700)]
Move VpnDialogs into core.mk.
It is required by the APIs of user space VPN.
Bug:
5495078
Change-Id: I30c309c4f6467a35fca95e76f666799816874752
Chia-chi Yeh [Fri, 21 Oct 2011 23:39:46 +0000 (16:39 -0700)]
am
07767a9e: (-s ours) Move VpnDialogs into core.mk.
* commit '
07767a9e748fdbdab2297974ad01cb265e7fb5a9':
Move VpnDialogs into core.mk.
Wink Saville [Fri, 21 Oct 2011 23:31:55 +0000 (16:31 -0700)]
Change BUILD_ID.
On master branch build id should be MASTER.
Change-Id: I7829b3933947730b298fca8a4e39de6a60b9caad
Chia-chi Yeh [Fri, 21 Oct 2011 23:04:39 +0000 (16:04 -0700)]
Move VpnDialogs into core.mk.
It is required by the APIs of user space VPN.
Also remove the dead VpnServices.
Bug:
5495078
Change-Id: I321b8da16898cd547ed79bea9c264b5e7bc781eb
The Android Automerger [Fri, 21 Oct 2011 22:59:05 +0000 (15:59 -0700)]
ICL21
The Android Automerger [Fri, 21 Oct 2011 22:54:07 +0000 (15:54 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Tor Norbye [Fri, 21 Oct 2011 02:18:15 +0000 (19:18 -0700)]
Build fix - include sdk/lint in build
Change-Id: Id65b7a3f72dd6c5104738fa872f3beb029d91163
The Android Automerger [Fri, 21 Oct 2011 00:22:10 +0000 (17:22 -0700)]
IFL10F
The Android Automerger [Fri, 21 Oct 2011 00:18:53 +0000 (17:18 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Automerger [Thu, 20 Oct 2011 22:52:55 +0000 (15:52 -0700)]
ICL20C
The Android Automerger [Thu, 20 Oct 2011 22:47:58 +0000 (15:47 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Thu, 20 Oct 2011 19:38:01 +0000 (12:38 -0700)]
ICL20B
The Android Open Source Project [Thu, 20 Oct 2011 16:17:01 +0000 (09:17 -0700)]
Reconcile with ics-mr0-release
Change-Id: Id2ef87f3662a93f2cedbf1dcb7f0f33d9893637e
The Android Automerger [Thu, 20 Oct 2011 13:32:58 +0000 (06:32 -0700)]
ICL20
The Android Automerger [Thu, 20 Oct 2011 13:32:37 +0000 (06:32 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Thu, 20 Oct 2011 02:03:39 +0000 (19:03 -0700)]
ICL19B
The Android Automerger [Thu, 20 Oct 2011 01:59:30 +0000 (18:59 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Scott Main [Wed, 19 Oct 2011 23:29:36 +0000 (16:29 -0700)]
am
51372cd2: docs: update "na" style to make opaque, add dropshadow, and re-order z-index to be on top of images
* commit '
51372cd2e564f411ad80821c7adad210bea7d8b7':
docs: update "na" style to make opaque, add dropshadow, and re-order z-index to be on top of images
Scott Main [Wed, 19 Oct 2011 23:09:26 +0000 (16:09 -0700)]
docs: update "na" style to make opaque, add dropshadow, and re-order
z-index to be on top of images
Change-Id: I7c0c2e15d511f4362eb721bf8eb0343fa3f24bc0
The Android Open Source Project [Wed, 19 Oct 2011 14:22:54 +0000 (07:22 -0700)]
Reconcile with ics-mr0-release
Change-Id: Icde55521aef897a6473868d9d8fd0413a4dfd255
The Android Automerger [Wed, 19 Oct 2011 13:30:18 +0000 (06:30 -0700)]
ICL19
The Android Automerger [Wed, 19 Oct 2011 13:27:09 +0000 (06:27 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Wed, 19 Oct 2011 00:00:01 +0000 (17:00 -0700)]
ICL18B
The Android Automerger [Tue, 18 Oct 2011 23:53:28 +0000 (16:53 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Bjorn Bringert [Tue, 18 Oct 2011 16:48:20 +0000 (09:48 -0700)]
Merge "Compile each proto file separately"
Bjorn Bringert [Tue, 18 Oct 2011 15:08:27 +0000 (16:08 +0100)]
Compile each proto file separately
Before, if a module had several proto source files,
they would all be compiled in a single invocation
of aprotoc. If any of the files imported one of the
other files, you got an aprotoc error about duplicates.
And if you removed the files that were imported
from the list of source files, no Java code
would be generated for the imported files,
causing a Java compile time error.
This changes compiles each proto file separately, which
avoids both of the problems above. It's slightly more
inefficient, but aprotoc is really fast.
Change-Id: I7bd8092ec2953c20269367a1c68ff84acceea3be
OSDN Git Service
