Elliott Hughes 938473a7f0 resolved conflicts for merge of 7efad83d to lmp-dev-plus-aosp ...

Change-Id: I3994c3c69e187e08d69642e097de14b5040c5b3b

2014-09-08 16:21:24 -07:00

..

arch-arm

resolved conflicts for merge of 7efad83d to lmp-dev-plus-aosp

2014-09-08 16:21:24 -07:00

arch-arm64

resolved conflicts for merge of 7efad83d to lmp-dev-plus-aosp

2014-09-08 16:21:24 -07:00

arch-common/bionic

Revert "Register __libc_fini as early as possible."

2014-09-04 21:54:34 +00:00

arch-mips

resolved conflicts for merge of 7efad83d to lmp-dev-plus-aosp

2014-09-08 16:21:24 -07:00

arch-mips64

resolved conflicts for merge of 7efad83d to lmp-dev-plus-aosp

2014-09-08 16:21:24 -07:00

arch-x86

resolved conflicts for merge of 7efad83d to lmp-dev-plus-aosp

2014-09-08 16:21:24 -07:00

arch-x86_64

resolved conflicts for merge of 7efad83d to lmp-dev-plus-aosp

2014-09-08 16:21:24 -07:00

bionic

resolved conflicts for merge of 7efad83d to lmp-dev-plus-aosp

2014-09-08 16:21:24 -07:00

dns

am 7b87d441: Merge "Switch to OpenBSD res_random."

2014-08-26 23:41:23 +00:00

include

resolved conflicts for merge of c8f6b82f to lmp-dev-plus-aosp

2014-09-08 11:41:30 -07:00

kernel

am 3bcd414b: Merge "Clean up some of our python scripts."

2014-08-20 20:49:21 +00:00

private

am 320a01d5: Merge "Revert "Load libraries in breadth-first order""

2014-09-05 23:58:07 +00:00

stdio

Add <stdio_ext.h> for elfutils.

2014-08-20 10:23:52 -07:00

tools

resolved conflicts for merge of 7efad83d to lmp-dev-plus-aosp

2014-09-08 16:21:24 -07:00

tzcode

Fix the tzdata update tools.

2014-08-06 17:31:48 -07:00

upstream-dlmalloc

Put all allocation functions into dispatch table.

2014-06-12 15:08:18 -07:00

upstream-freebsd

Fix _BSD_SOURCE/__USE_BSD.

2014-08-19 09:18:03 -07:00

upstream-netbsd

Ignore all __weak_alias in OpenBSD libC.

2014-08-28 15:10:01 -07:00

upstream-openbsd

Ignore all __weak_alias in OpenBSD libC.

2014-08-28 15:10:01 -07:00

zoneinfo

Upgrade bionic to tzdata2014g.

2014-09-02 11:33:16 -07:00

Android.mk

am 8adace5f: Merge "Enable clang compilation with libc but not linker."

2014-09-05 19:11:06 +00:00

crt.mk

Reconfig libc's Android.mk to build for multilib

2014-02-12 13:58:34 -08:00

MODULE_LICENSE_BSD

…

NOTICE

Implement twalk(3), add unit tests.

2014-07-24 15:14:06 -07:00

SYSCALLS.TXT

Remove _flush_cache(2) for mips64.

2014-08-21 13:32:37 -07:00