Paul Jensen 6f706dd88c am c8167111: resolved conflicts for merge of 804b95e5 to klp-modular-dev-plus-aosp ...

* commit 'c8167111d57992b8ce3ca554a9499973c55aa174':
  bionic: Replace iface with opaque netid in resolver.

2014-04-04 03:19:05 +00:00

..

arch-arm

Remove <machine/limits.h>.

2014-04-01 17:16:59 -07:00

arch-arm64

Remove <machine/limits.h>.

2014-04-01 17:16:59 -07:00

arch-common/bionic

AArch64: Add initial support for AArch64

2013-12-16 17:00:22 -08:00

arch-mips

Remove <machine/limits.h>.

2014-04-01 17:16:59 -07:00

arch-mips64

Remove <machine/limits.h>.

2014-04-01 17:16:59 -07:00

arch-x86

Remove <machine/limits.h>.

2014-04-01 17:16:59 -07:00

arch-x86_64

Remove <machine/limits.h>.

2014-04-01 17:16:59 -07:00

bionic

Fix the POSIX timers fix.

2014-04-01 19:07:52 -07:00

dns

bionic: Replace iface with opaque netid in resolver.

2014-04-01 16:25:49 -04:00

include

Merge "bionic: Replace iface with opaque netid in resolver."

2014-04-03 17:05:32 +00:00

kernel

am 9b0fa57c: am e2a0f15c: Merge "Regenerate adf header"

2014-04-03 02:11:16 +00:00

private

am 081db840: Allow overlap in resolv uid => DNS iface mapping

2014-03-21 21:02:40 +00:00

stdio

Remove ALIGNBYTES and ALIGN from <sys/param.h>

2014-03-21 09:59:34 +00:00

stdlib

Add lconv declaration and localeconv(3)

2014-03-28 11:15:03 +00:00

tools

Bring the generate-NOTICE script up to date.

2014-03-06 15:10:22 -08:00

tzcode

Merge "Fix locatime.c indentation after sync"

2014-02-28 18:02:22 +00:00

unistd

Reimplement clock(3) and switch to OpenBSD time(3).

2014-03-11 13:37:11 -07:00

upstream-dlmalloc

Fix build warning of initialization but no use.

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

upstream-freebsd

Clean up <stdio.h> macros.

2014-03-13 14:54:53 -07:00

upstream-netbsd

Add lsearch(3) for ltrace.

2014-04-01 12:40:00 -07:00

upstream-openbsd

Add lconv declaration and localeconv(3)

2014-03-28 11:15:03 +00:00

zoneinfo

Upgrade to tzdata2014b.

2014-04-02 14:43:27 -07:00

Android.mk

Add lsearch(3) for ltrace.

2014-04-01 12:40:00 -07:00

crt.mk

Reconfig libc's Android.mk to build for multilib

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

MODULE_LICENSE_BSD

auto import from //depot/cupcake/@135843

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

NOTICE

Update the NOTICE files

2014-03-10 11:23:52 +00:00

SYSCALLS.TXT

Add accept4() syscall

2014-03-26 15:50:01 +02:00