Andreas Gampe c16f0486fc resolved conflicts for merge of 2b10e2f1 to lmp-dev-plus-aosp ...

Change-Id: Ia41583773abbbe1f52d72d1e7f4b925e621d28ff

2014-09-02 22:02:48 -07:00

..

arch-arm

Fix pthread_getattr_np for the main thread.

2014-08-26 12:55:01 -07:00

arch-arm64

Fix pthread_getattr_np for the main thread.

2014-08-26 12:55:01 -07:00

arch-common/bionic

…

arch-mips

Merge "Fix strlen function type for mips."

2014-08-27 23:09:30 +00:00

arch-mips64

MIPS64 syscall() arguments

2014-09-02 12:41:01 -07:00

arch-x86

Merge "Replace ambiguous cmp instruction with cmpl."

2014-08-27 22:46:07 +00:00

arch-x86_64

Fix pthread_getattr_np for the main thread.

2014-08-26 12:55:01 -07:00

bionic

am 29f06943: Merge "Add GNU-compatible strerror_r."

2014-08-29 11:39:55 +00:00

dns

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

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

include

resolved conflicts for merge of 2b10e2f1 to lmp-dev-plus-aosp

2014-09-02 22:02:48 -07:00

kernel

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

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

private

am c764fb24: Merge "Fix pthread_getattr_np for the main thread."

2014-08-26 20:08:44 +00:00

stdio

Add <stdio_ext.h> for elfutils.

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

tools

__gnu_basename(3) is accounted for.

2014-08-21 11:36:07 -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 09:51:04 -07:00

Android.mk

Use the default unwind code.

2014-08-27 13:13:21 -07:00

crt.mk

…

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