The Android Automerger
f5fc5d467c
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-06 05:55:11 -08:00
Brian Carlstrom
2527a8b5a6
am 9043202b
: am 20958207
: Merge "Fix MIPS linker build"
...
* commit '9043202b5bb8e0725b0302e9da9d3a57c837e798':
Fix MIPS linker build
2013-03-06 09:18:59 +00:00
Brian Carlstrom
9043202b5b
am 20958207
: Merge "Fix MIPS linker build"
...
* commit '20958207d5f9d36cc6f6b3edc4ff899c73b72b02':
Fix MIPS linker build
2013-03-06 01:17:27 -08:00
Brian Carlstrom
20958207d5
Merge "Fix MIPS linker build"
2013-03-06 09:06:16 +00:00
Brian Carlstrom
43cc7f795b
Fix MIPS linker build
...
(cherry-picked from 8c7d8c2057e303985f78eab96da747ddaa013c78)
Change-Id: Idcf62ab95f8fccbc2d7c3e771a4cfbe768a1555e
2013-03-06 01:05:08 -08:00
Elliott Hughes
c1a5d20d08
am 9a0b658c
: am c41dcad0
: Merge "More linker cleanup."
...
* commit '9a0b658c9c1f8f4492f61a75909e5ca2f05c3ac1':
More linker cleanup.
2013-03-06 06:44:06 +00:00
Elliott Hughes
9a0b658c9c
am c41dcad0
: Merge "More linker cleanup."
...
* commit 'c41dcad040ede2975ea63e383a8a3d36e3642d56':
More linker cleanup.
2013-03-05 22:42:33 -08:00
Elliott Hughes
c41dcad040
Merge "More linker cleanup."
2013-03-06 06:26:56 +00:00
Elliott Hughes
650be4e584
More linker cleanup.
...
Change-Id: I9fb3c7c0d4b4ffef0eeaf092d4e30ffe63a08671
2013-03-05 22:24:34 -08:00
Brian Carlstrom
a2cfd1a27f
am 8c65a1e4
: am a2517de3
: am 036f9097
: Merge "Minor linker cleanup, primarily to use Elf32_Dyn"
...
* commit '8c65a1e466dae62217700065256921ba86290faa':
Minor linker cleanup, primarily to use Elf32_Dyn
2013-03-06 01:25:09 +00:00
Brian Carlstrom
8c65a1e466
am a2517de3
: am 036f9097
: Merge "Minor linker cleanup, primarily to use Elf32_Dyn"
...
* commit 'a2517de3844d95b5f00a4666b8dae00ef893ac24':
Minor linker cleanup, primarily to use Elf32_Dyn
2013-03-06 01:22:25 +00:00
Brian Carlstrom
a2517de384
am 036f9097
: Merge "Minor linker cleanup, primarily to use Elf32_Dyn"
...
* commit '036f909720fd0d56dbd04b9a761fb1d0714980b0':
Minor linker cleanup, primarily to use Elf32_Dyn
2013-03-05 17:20:35 -08:00
Brian Carlstrom
036f909720
Merge "Minor linker cleanup, primarily to use Elf32_Dyn"
2013-03-06 01:01:23 +00:00
Brian Carlstrom
d4ee82dfa3
Minor linker cleanup, primarily to use Elf32_Dyn
...
Change-Id: Ifa9408e9859c6f79444715bed4808b7c13fdced5
2013-03-05 15:27:21 -08:00
Elliott Hughes
b3b0037884
am 97a8217a
: am 3f7b1cd3
: am be21fe7a
: Merge "Upgrade to tzdata2013a."
...
* commit '97a8217ae1a23a808f7bb3af2f492040e7080549':
Upgrade to tzdata2013a.
2013-03-05 22:25:39 +00:00
Elliott Hughes
97a8217ae1
am 3f7b1cd3
: am be21fe7a
: Merge "Upgrade to tzdata2013a."
...
* commit '3f7b1cd3acf9990efea9f75559b2f873ab3838fe':
Upgrade to tzdata2013a.
2013-03-05 22:23:45 +00:00
Elliott Hughes
3f7b1cd3ac
am be21fe7a
: Merge "Upgrade to tzdata2013a."
...
* commit 'be21fe7a5947e24f9f0db90f8e16c54766d1237a':
Upgrade to tzdata2013a.
2013-03-05 14:22:01 -08:00
Elliott Hughes
be21fe7a59
Merge "Upgrade to tzdata2013a."
2013-03-05 22:19:14 +00:00
Elliott Hughes
69af6e61e1
Upgrade to tzdata2013a.
...
From the release notes:
Chile's 2013 rules, and we guess rules for 2014 and later, will be
the same as 2012, namely Apr Sun>=23 03:00 UTC to Sep Sun>=2 04:00 UTC.
(Thanks to Steffen Thorsen and Robert Elz.)
New Zones Asia/Khandyga, Asia/Ust-Nera, Europe/Busingen.
(Thanks to Tobias Conradi and Arthur David Olson.)
Change-Id: I351e04b3348420ad7df7c648963c235b534033d2
2013-03-05 14:00:38 -08:00
Ben Cheng
7eaed030de
am 6ad68558
: am e5e6e17c
: am 133d97e4
: Merge "Add stack unwinding directives to memcpy."
...
* commit '6ad68558ed4429f7ab0dbad9a5bbf18aacde8362':
Add stack unwinding directives to memcpy.
2013-03-05 21:22:49 +00:00
Ben Cheng
6ad68558ed
am e5e6e17c
: am 133d97e4
: Merge "Add stack unwinding directives to memcpy."
...
* commit 'e5e6e17c5bd06e097c5bb4da9a23b5e293309ab9':
Add stack unwinding directives to memcpy.
2013-03-05 21:20:42 +00:00
Ben Cheng
e5e6e17c5b
am 133d97e4
: Merge "Add stack unwinding directives to memcpy."
...
* commit '133d97e4b07a733787fb85692ad8427fdc3d1d22':
Add stack unwinding directives to memcpy.
2013-03-05 13:17:23 -08:00
Elliott Hughes
136e00d6e9
am c96ad9bc
: am 7b69ac53
: am cf9a9604
: Merge "Switch to upstream-freebsd for the unmolested wchar code."
...
* commit 'c96ad9bcd28fcd2b34040a2a696262057a11470b':
Switch to upstream-freebsd for the unmolested wchar code.
2013-03-05 21:05:24 +00:00
Ben Cheng
133d97e4b0
Merge "Add stack unwinding directives to memcpy."
2013-03-05 21:04:38 +00:00
Elliott Hughes
c96ad9bcd2
am 7b69ac53
: am cf9a9604
: Merge "Switch to upstream-freebsd for the unmolested wchar code."
...
* commit '7b69ac535abca0e7867524e68f5a3581cc367de8':
Switch to upstream-freebsd for the unmolested wchar code.
2013-03-05 20:28:28 +00:00
Elliott Hughes
7b69ac535a
am cf9a9604
: Merge "Switch to upstream-freebsd for the unmolested wchar code."
...
* commit 'cf9a9604adb27600c79ca236578a8be89168202f':
Switch to upstream-freebsd for the unmolested wchar code.
2013-03-05 12:27:09 -08:00
Elliott Hughes
cf9a9604ad
Merge "Switch to upstream-freebsd for the unmolested wchar code."
2013-03-05 20:13:33 +00:00
The Android Open Source Project
adff4e8630
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I2635d0c79d4adc135c7f0b6345547ed5e3114158
2013-03-05 07:53:05 -08:00
The Android Automerger
5b5aa0317c
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-05 05:55:15 -08:00
Elliott Hughes
7ef3ccb7bb
am 81e0f35a
: am 2125c155
: am d392e044
: Merge "Move realpath.c to upstream-freebsd."
...
* commit '81e0f35acc41cfafccc6d28a9122f115ca6e4a16':
Move realpath.c to upstream-freebsd.
2013-03-04 23:58:16 +00:00
Elliott Hughes
81e0f35acc
am 2125c155
: am d392e044
: Merge "Move realpath.c to upstream-freebsd."
...
* commit '2125c15506cbe9e4062d72ebb723d164e9c01c1f':
Move realpath.c to upstream-freebsd.
2013-03-04 23:56:56 +00:00
The Android Open Source Project
98650e04e6
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I92fd2ef799f358dd022234bc5fa7e6693f0619f0
2013-03-04 11:06:25 -08:00
Elliott Hughes
2125c15506
am d392e044
: Merge "Move realpath.c to upstream-freebsd."
...
* commit 'd392e044c7a03ff1c0903c3512d00955bc7de473':
Move realpath.c to upstream-freebsd.
2013-03-04 08:25:58 -08:00
The Android Automerger
2ec68f6833
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-04 05:55:08 -08:00
Elliott Hughes
eb93ebffba
Switch to upstream-freebsd for the unmolested wchar code.
...
Change-Id: I87b4d76ff8da04109ae53638eec4f11629798960
2013-03-01 18:35:56 -08:00
Elliott Hughes
d392e044c7
Merge "Move realpath.c to upstream-freebsd."
2013-03-02 01:22:04 +00:00
Christopher Ferris
29cc4946ac
Merge "Remove unused arm defines. DO NOT MERGE" into jb-mr2-dev
2013-03-02 01:16:00 +00:00
Elliott Hughes
f0777843c0
Move realpath.c to upstream-freebsd.
...
This is actually a slightly newer upstream version than the one I
originally pulled. Hopefully now it's in upstream-freebsd it will
be easier to track upstream, though I still need to sit down and
write the necessary scripts at some point.
Bug: 5110679
Change-Id: I87e563f0f95aa8e68b45578e2a8f448bbf827a33
2013-03-01 17:11:39 -08:00
Christopher Ferris
947b3ab02b
Remove unused arm defines. DO NOT MERGE
...
The defines HAVE_32_BYTE_CACHE_LINES and ARCH_ARM_USE_NON_NEON_MEMCPY
are not used by any code. The previous memcpy code that used these
has been split into different architecture versions to avoid the need
for them.
Bug: 8005082
(cherry picked from commit 6e1a5cf31b
)
Change-Id: I69654d47db1458136782b5504290f620e924ee75
2013-03-01 16:54:56 -08:00
Ben Cheng
14283004f5
Add stack unwinding directives to memcpy.
...
Also include some Android specific header files.
Change-Id: Idbcbd43458ba945ca8c61bfbc04ea15fc0ae4e00
2013-03-01 14:56:04 -08:00
Ben Cheng
b9ef7f4e12
am 52b3aed7
: am c5c6cb3f
: am 66273ac2
: Merge "Adding strcmp tuned for Cortex-A15."
...
* commit '52b3aed7982e9d68aad0652f54d5ee180ddf1c5a':
Adding strcmp tuned for Cortex-A15.
2013-03-01 18:28:25 +00:00
Ben Cheng
ae280bcdbe
am 55fc93a9
: am 8f149da0
: am b3b1ab62
: Merge "Adding memcpy tuned for Cortex-A15."
...
* commit '55fc93a90961022e38ef0bb63bcb81d2b4e5aef6':
Adding memcpy tuned for Cortex-A15.
2013-03-01 18:28:25 +00:00
Nick Kralevich
04190c53e3
am cc646773
: am 305a9995
: am 8fa924e5
: Merge "unistd.h: don\'t include sys/capability.h"
...
* commit 'cc64677342209d38f88138c03d3ded0e1d61637c':
unistd.h: don't include sys/capability.h
2013-03-01 18:28:24 +00:00
Ben Cheng
52b3aed798
am c5c6cb3f
: am 66273ac2
: Merge "Adding strcmp tuned for Cortex-A15."
...
* commit 'c5c6cb3f13642386e08acf687b4bc39f568bad0c':
Adding strcmp tuned for Cortex-A15.
2013-03-01 10:26:52 -08:00
Ben Cheng
55fc93a909
am 8f149da0
: am b3b1ab62
: Merge "Adding memcpy tuned for Cortex-A15."
...
* commit '8f149da08dc3125824e168f8d29613be80b2085c':
Adding memcpy tuned for Cortex-A15.
2013-03-01 10:26:52 -08:00
Nick Kralevich
cc64677342
am 305a9995
: am 8fa924e5
: Merge "unistd.h: don\'t include sys/capability.h"
...
* commit '305a999589a8dfde077589106853522d483d24d2':
unistd.h: don't include sys/capability.h
2013-03-01 10:26:51 -08:00
Ben Cheng
c5c6cb3f13
am 66273ac2
: Merge "Adding strcmp tuned for Cortex-A15."
...
* commit '66273ac2b6b8c2042350204575bd290d96dea681':
Adding strcmp tuned for Cortex-A15.
2013-03-01 10:24:58 -08:00
Ben Cheng
8f149da08d
am b3b1ab62
: Merge "Adding memcpy tuned for Cortex-A15."
...
* commit 'b3b1ab6213df15f99c9af3088cfe733428816fd3':
Adding memcpy tuned for Cortex-A15.
2013-03-01 10:24:58 -08:00
Nick Kralevich
305a999589
am 8fa924e5
: Merge "unistd.h: don\'t include sys/capability.h"
...
* commit '8fa924e5dff4588cca8586e0e727b9a544db7083':
unistd.h: don't include sys/capability.h
2013-03-01 10:24:57 -08:00
Ben Cheng
66273ac2b6
Merge "Adding strcmp tuned for Cortex-A15."
2013-03-01 18:18:34 +00:00