Jean-Baptiste Queru
7915b22e8f
am a4b20d71
: am b8e1033c
: (-s ours) am e5412a9a
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'a4b20d712b9c6cbc562529d3a41bf8ea1515562a':
2013-03-11 12:28:17 -07:00
Elliott Hughes
60ac09bdb2
am 6d6f5e61
: am 4b032ee9
: Merge "Let bionic use the correct definition of ssize_t."
...
* commit '6d6f5e618e054e79d80a02f2c3f76ce0fd73bb2a':
Let bionic use the correct definition of ssize_t.
2013-03-11 12:27:58 -07:00
Jean-Baptiste Queru
a4b20d712b
am b8e1033c
: (-s ours) am e5412a9a
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'b8e1033c5b5813cb97d19645075591a357e9f04a':
2013-03-11 12:22:41 -07:00
Jean-Baptiste Queru
b8e1033c5b
am e5412a9a
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'e5412a9a9597433ae2540b390269c514c46402f1':
2013-03-11 12:19:03 -07:00
Jean-Baptiste Queru
e5412a9a95
Reconcile with jb-mr1-release - do not merge
2013-03-11 12:15:11 -07:00
Elliott Hughes
bf32ffcf02
am 0b765862
: am 62c5cd07
: Merge "Upgrade to tzdata2013b."
...
* commit '0b765862e134e87174ddf9bdfa32528392f85e96':
Upgrade to tzdata2013b.
2013-03-11 11:29:24 -07:00
Elliott Hughes
6d6f5e618e
am 4b032ee9
: Merge "Let bionic use the correct definition of ssize_t."
...
* commit '4b032ee9b94137e41ee54e9bb3bcf0ba5ad43cbc':
Let bionic use the correct definition of ssize_t.
2013-03-11 11:07:29 -07:00
Elliott Hughes
4b032ee9b9
Merge "Let bionic use the correct definition of ssize_t."
2013-03-11 17:55:27 +00:00
Elliott Hughes
0b765862e1
am 62c5cd07
: Merge "Upgrade to tzdata2013b."
...
* commit '62c5cd0781e95c1c50b63c37a9a87bc158e64d38':
Upgrade to tzdata2013b.
2013-03-11 09:57:53 -07:00
Elliott Hughes
62c5cd0781
Merge "Upgrade to tzdata2013b."
2013-03-11 16:42:57 +00:00
Elliott Hughes
cdb27f239b
Upgrade to tzdata2013b.
...
From the release notes:
Changes affecting current and future time stamps:
Haiti uses US daylight-saving rules this year, and presumably future years.
This changes time stamps starting today. (Thanks to Steffen Thorsen.)
Paraguay will end DST on March 24 this year.
(Thanks to Steffen Thorsen.) For now, assume it's just this year.
Morocco does not observe DST during Ramadan;
try to predict Ramadan in Morocco as best we can.
(Thanks to Erik Homoet for the heads-up.)
Change-Id: I98d5290ea5a1d9fb1eeddab1c9e72135dc9e4bd1
2013-03-11 09:41:45 -07:00
The Android Automerger
e767b0f555
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-11 05:55:24 -07:00
Elliott Hughes
b6e22482d4
Let bionic use the correct definition of ssize_t.
...
Bug: 8253769
Change-Id: I50c7cc20828fc089b83580e039ce9153a6c5a8cc
2013-03-08 15:28:52 -08:00
Elliott Hughes
8a01572272
resolved conflicts for merge of 4706606c
to jb-mr2-dev
...
Change-Id: Ibf6340df901c870cd05a2ab56536ad23b6fd491c
2013-03-07 13:19:20 -08:00
Elliott Hughes
4706606c88
am 809eed1d
: Merge "Regenerate NOTICE files."
...
* commit '809eed1dedb833af1aba56c6a1d059123b43049a':
Regenerate NOTICE files.
2013-03-07 12:02:00 -08:00
Elliott Hughes
809eed1ded
Merge "Regenerate NOTICE files."
2013-03-07 19:57:17 +00:00
Elliott Hughes
0493a6f7be
Regenerate NOTICE files.
...
Also clean up some obsolete cruft.
Change-Id: Iec3b36f6607f7a08b72de99294ed5b6cd910dd5f
2013-03-07 11:51:10 -08:00
The Android Automerger
a312b02e85
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-07 05:55:07 -08:00
Elliott Hughes
0a2ee4750a
am ad7c275e
: am c9f80814
: Merge "Upgrade to current NetBSD popen/pclose."
...
* commit 'ad7c275e45088e1f13656b97dabbe911fff83664':
Upgrade to current NetBSD popen/pclose.
2013-03-07 01:04:52 +00:00
Elliott Hughes
ad7c275e45
am c9f80814
: Merge "Upgrade to current NetBSD popen/pclose."
...
* commit 'c9f80814259a81dce12ba35d1750fa2b23fef48d':
Upgrade to current NetBSD popen/pclose.
2013-03-06 17:03:28 -08:00
Elliott Hughes
c9f8081425
Merge "Upgrade to current NetBSD popen/pclose."
2013-03-07 00:54:22 +00:00
Elliott Hughes
6b3f49a537
Upgrade to current NetBSD popen/pclose.
...
This gets us back to using vfork now our ARM vfork assembler stub is
fixed, and adds the missing thread safety for the 'pidlist'.
Bug: 5335385
Change-Id: Ib08bfa65b2cb9fa695717aae629ea14816bf988d
2013-03-06 16:20:55 -08:00
Brian Carlstrom
c7b9f954a5
am 91392116
: am 33031fed
: Merge "Fix typo of DT_NEEDED for DT_NULL"
...
* commit '91392116ff859b2e7656ded729b8c758107241aa':
Fix typo of DT_NEEDED for DT_NULL
2013-03-07 00:12:13 +00:00
Brian Carlstrom
91392116ff
am 33031fed
: Merge "Fix typo of DT_NEEDED for DT_NULL"
...
* commit '33031fed84e24fb7791f123df45abc1a3812ac59':
Fix typo of DT_NEEDED for DT_NULL
2013-03-06 16:11:07 -08:00
Brian Carlstrom
33031fed84
Merge "Fix typo of DT_NEEDED for DT_NULL"
2013-03-06 23:55:56 +00:00
Brian Carlstrom
2d4b9b7cff
Fix typo of DT_NEEDED for DT_NULL
...
(cherry-pick of 138b205ea9efc117fe522c2d7191378023a6e2cd)
Change-Id: Ia895cb3018df55554627f1f61dcdfdada4a961ce
2013-03-06 15:50:30 -08:00
Elliott Hughes
9c0c056bed
am 6b1aa1b1
: am db794197
: Merge "Fix debug malloc."
...
* commit '6b1aa1b16bc2cf8ba17e33fca4ffc399368b356c':
Fix debug malloc.
2013-03-06 23:24:59 +00:00
Elliott Hughes
6b1aa1b16b
am db794197
: Merge "Fix debug malloc."
...
* commit 'db794197cc880e3805bcefbea780476a359066c2':
Fix debug malloc.
2013-03-06 15:22:24 -08:00
Elliott Hughes
db794197cc
Merge "Fix debug malloc."
2013-03-06 23:13:01 +00:00
Elliott Hughes
642331b5dd
Fix debug malloc.
...
This was broken by the change to use AT_RANDOM for the stack guards.
Bug: 7959813
Bug: 8330764
Change-Id: I791900092b72a9a900f16585237fa7ad82aaed9f
2013-03-06 15:03:53 -08:00
Elliott Hughes
bac72abae4
am 50a2cd86
: am 0b4a85bf
: Merge "Fix TIMING/STATS/COUNT_PAGES dynamic linker build"
...
* commit '50a2cd865e7cc8c72d926548ed5d64e269003055':
Fix TIMING/STATS/COUNT_PAGES dynamic linker build
2013-03-06 17:44:43 +00:00
Elliott Hughes
50a2cd865e
am 0b4a85bf
: Merge "Fix TIMING/STATS/COUNT_PAGES dynamic linker build"
...
* commit '0b4a85bf1e11e28f66d0f101f9e7d4c51a0bb31c':
Fix TIMING/STATS/COUNT_PAGES dynamic linker build
2013-03-06 09:41:56 -08:00
Elliott Hughes
0b4a85bf1e
Merge "Fix TIMING/STATS/COUNT_PAGES dynamic linker build"
2013-03-06 17:25:51 +00:00
Kito Cheng
5e2492eb89
Fix TIMING/STATS/COUNT_PAGES dynamic linker build
...
Change-Id: I6432ac378816da253b83d1c7fb1d3fb64647b89e
2013-03-06 23:58:48 +08:00
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
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
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