The Android Automerger
c24e8f5e7f
IML32B
2011-11-01 17:34:07 -07:00
The Android Open Source Project
512879f4c5
Reconcile with ics-mr0-release
...
Change-Id: Ide415fc461dfd7d5899b51cb07f380e9ca95ed6b
2011-11-01 14:28:52 -07:00
The Android Open Source Project
ab5b6ecdde
am 5b85b190: Reconcile with ics-factoryrom-2-release
...
* commit '5b85b1900c9b58db7642db2d189766767fc259be':
ITL31
2011-11-01 17:10:36 +00:00
The Android Open Source Project
5b85b1900c
Reconcile with ics-factoryrom-2-release
...
Change-Id: I5488896eaf252e88fd0a7c8052c1e27be3f91e6f
2011-11-01 10:08:00 -07:00
The Android Automerger
598e41b555
ICL32B
2011-11-01 07:13:34 -07:00
The Android Automerger
42d879efa4
merge in ics-mr0-release history after reset to ics-mr0
2011-11-01 07:12:37 -07:00
The Android Automerger
e573b72204
IML32
2011-11-01 06:47:37 -07:00
The Android Automerger
a5087bccb2
merge in ics-mr1-release history after reset to ics-mr1
2011-11-01 06:45:14 -07:00
The Android Automerger
4d9a55b3a3
ICL32
2011-11-01 06:29:20 -07:00
The Android Automerger
3cb9c6e219
merge in ics-mr0-release history after reset to ics-mr0
2011-11-01 06:27:11 -07:00
The Android Automerger
d8e44bce6f
ITL31
2011-10-31 16:41:16 -07:00
The Android Automerger
f5702953c5
IML31B
2011-10-31 16:31:05 -07:00
Eric Fischer
492ae8733e
Add Amharic and Hindi to the list of all locales.
...
Change-Id: I46d7b2c1e16edb7f96fd4be17fbe37b49b8658aa
2011-10-31 16:09:04 -07:00
The Android Open Source Project
adb70c57c2
Reconcile with ics-mr0-release
...
Change-Id: I7388dfaa2145b726609e8b30dea22740cd1b1d7b
2011-10-31 13:06:18 -07:00
The Android Open Source Project
8bfe131e2f
am db6281e8: Reconcile with ics-factoryrom-2-release
...
* commit 'db6281e8bb5e258c8841c162ee9f34660912b13d':
ITL30B
ITL30
ITL28B
ITL28
2011-10-31 19:45:30 +00:00
The Android Open Source Project
db6281e8bb
Reconcile with ics-factoryrom-2-release
...
Change-Id: I7f53fdbe6acf900cdd3322d238bf6fa659c95ff0
2011-10-31 12:43:34 -07:00
The Android Automerger
310ec041a4
IML31
2011-10-31 06:47:46 -07:00
The Android Automerger
8ba415edc4
merge in ics-mr1-release history after reset to ics-mr1
2011-10-31 06:45:23 -07:00
The Android Automerger
6ca7cab746
ICL31
2011-10-31 06:31:30 -07:00
The Android Automerger
0fefb1f860
merge in ics-mr0-release history after reset to ics-mr0
2011-10-31 06:27:25 -07:00
The Android Automerger
a93af2b685
ITL30B
2011-10-30 13:51:03 -07:00
The Android Automerger
3c810f8639
ITL30
2011-10-30 12:35:43 -07:00
The Android Automerger
0b0ff231cd
merge in ics-factoryrom-2-release history after reset to ics-mr0
2011-10-30 12:34:39 -07:00
The Android Automerger
f4abc55677
IML30
2011-10-30 06:50:58 -07:00
The Android Automerger
3198551a47
merge in ics-mr1-release history after reset to ics-mr1
2011-10-30 06:45:31 -07:00
The Android Automerger
5bfb01150c
ICL30
2011-10-30 06:32:02 -07:00
The Android Automerger
f16eae2a37
merge in ics-mr0-release history after reset to ics-mr0
2011-10-30 06:27:17 -07:00
The Android Automerger
6d907b114d
ITL28B
2011-10-28 23:24:05 -07:00
The Android Automerger
05bf9a2151
ITL28
2011-10-28 20:27:28 -07:00
The Android Automerger
ecf4ddf6bc
IML27C
2011-10-28 16:19:56 -07:00
The Android Open Source Project
5d8f09e5b3
Reconcile with ics-mr0-release
...
Change-Id: I8e45b4aba1157aec4a3d12cf9cd2b77610b677e9
2011-10-28 15:59:38 -07:00
The Android Automerger
ac17e30d99
ICL28B
2011-10-28 13:47:54 -07:00
The Android Open Source Project
0393a5366e
Reconcile with ics-mr0-release
...
Change-Id: I531ca70758d587d3f5d540a033009e2dffeaf301
2011-10-28 13:05:02 -07:00
The Android Automerger
b5a2406e97
ICL28
2011-10-28 09:56:13 -07:00
The Android Automerger
10ea455d47
merge in ics-mr0-release history after reset to ics-mr0
2011-10-28 09:52:15 -07:00
The Android Open Source Project
682967e1ee
am d50bc1bb: Reconcile with ics-factoryrom-2-release
...
* commit 'd50bc1bb3cd1ba5406dfc0b99bc3030bb8ae6ae3':
ITL27
ITL26B
2011-10-28 16:45:28 +00:00
The Android Open Source Project
d50bc1bb3c
Reconcile with ics-factoryrom-2-release
...
Change-Id: Ieddd7ec26db003b46bfc01db728a5795cbff61ab
2011-10-28 09:43:52 -07:00
Jean-Baptiste Queru
68eb6649fe
am 432f8d88: Reconcile with AOSP master
...
* commit '432f8d881d22a4516aeac46fb0d80359a252d692':
HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE
2011-10-28 15:25:49 +00:00
Jean-Baptiste Queru
432f8d881d
Reconcile with AOSP master
...
Change-Id: I01bd9c391b6adaabbad233b308c5dbecfd9f2827
2011-10-28 08:23:21 -07:00
The Android Automerger
fe921ceaaa
ILC27B
2011-10-27 21:39:47 -07:00
The Android Automerger
55ca472480
ILC27B
2011-10-27 19:48:00 -07:00
The Android Automerger
b76ac5198f
ITL27
2011-10-27 19:31:15 -07:00
The Android Automerger
4e04760e39
merge in ics-factoryrom-2-release history after reset to ics-mr0
2011-10-27 19:29:34 -07:00
The Android Automerger
bf03e80740
IML27B
2011-10-27 18:27:30 -07:00
The Android Automerger
c81b9a7f6c
ICL27B
2011-10-27 17:47:07 -07:00
Jim Huang
fddf23f19e
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
2011-10-27 10:38:10 -07:00
The Android Automerger
9dc3738e79
IML27
2011-10-27 06:49:14 -07:00
The Android Automerger
73728f5587
merge in ics-mr1-release history after reset to ics-mr1
2011-10-27 06:45:26 -07:00
The Android Automerger
c3b08ce214
ICL27
2011-10-27 06:29:39 -07:00
The Android Automerger
1016c54289
merge in ics-mr0-release history after reset to ics-mr0
2011-10-27 06:27:10 -07:00
