Elliott Hughes 8a01572272 resolved conflicts for merge of 4706606c to jb-mr2-dev ...

Change-Id: Ibf6340df901c870cd05a2ab56536ad23b6fd491c

2013-03-07 13:19:20 -08:00

..

arch-arm

am e5e6e17c: am 133d97e4: Merge "Add stack unwinding directives to memcpy."

2013-03-05 21:20:42 +00:00

arch-mips

Break bionic implementations into arch versions. DO NOT MERGE

2013-02-28 17:45:16 -08:00

arch-x86

Break bionic implementations into arch versions. DO NOT MERGE

2013-02-28 17:45:16 -08:00

bionic

Fix debug malloc.

2013-03-06 15:03:53 -08:00

include

am 7b69ac53: am cf9a9604: Merge "Switch to upstream-freebsd for the unmolested wchar code."

2013-03-05 20:28:28 +00:00

kernel

Fix mako builds. Do not merge.

2013-02-20 12:47:58 -08:00

netbsd

Merge "gethostbyname: fix crash"

2013-02-22 19:32:37 +00:00

private

am d9cb6988: am 406968b2: am c0e9ddd0: Merge "Reimplement scandir(3)."

2013-02-25 22:58:44 +00:00

stdio

Define DEFFILEMODE and friends

2012-11-29 11:53:33 -08:00

stdlib

stdlib: atexit: include <sys/cdefs.h>

2013-02-16 21:23:27 +05:30

string

clean up FORTIFY_SOURCE handling.

2012-12-04 15:27:30 -08:00

tools

Remove dead code from gensyscalls.py.

2013-02-07 14:07:00 -08:00

tzcode

Revert "DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic.""

2013-01-16 10:34:33 -08:00

unistd

Upgrade to current NetBSD popen/pclose.

2013-03-06 16:20:55 -08:00

upstream-dlmalloc

Fix build warning of initialization but no use.

2012-09-06 09:59:13 -07:00

upstream-freebsd

Regenerate NOTICE files.

2013-03-07 11:51:10 -08:00

upstream-netbsd

Upgrade to current NetBSD popen/pclose.

2013-03-06 16:20:55 -08:00

wchar

Switch to upstream-freebsd for the unmolested wchar code.

2013-03-01 18:35:56 -08:00

zoneinfo

Upgrade to tzdata2013a.

2013-03-05 14:00:38 -08:00

Android.mk

am ad7c275e: am c9f80814: Merge "Upgrade to current NetBSD popen/pclose."

2013-03-07 01:04:52 +00:00

CAVEATS

auto import from //depot/cupcake/@135843

2009-03-03 19:28:35 -08:00

MODULE_LICENSE_BSD

auto import from //depot/cupcake/@135843

2009-03-03 19:28:35 -08:00

NOTICE

Regenerate NOTICE files.

2013-03-07 11:51:10 -08:00

SYSCALLS.TXT

Regenerate NOTICE files.

2013-03-07 11:51:10 -08:00