Elliott Hughes e3c9f21eaf resolved conflicts for merge of 912fe0a6 to lmp-mr1-dev-plus-aosp ...

Change-Id: Ie1cc84f34ccaf27eae4f3c292d67d44a9f0276bc

2014-10-29 12:38:36 -07:00

..

arch-arm

Fix 32-bit arm unwinding through signal frames.

2014-10-27 16:41:56 -07:00

arch-arm64

Remove the unnecessary generic-neon code.

2014-10-28 12:07:25 -07:00

arch-common/bionic

Revert "Register __libc_fini as early as possible."

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

arch-mips

Add clock_settime and clock_nanosleep.

2014-10-13 17:04:10 -07:00

arch-mips64

Add clock_settime and clock_nanosleep.

2014-10-13 17:04:10 -07:00

arch-x86

Merge remote-tracking branch 'goog/lmp-mr1-ub-dev' into manualmerge

2014-10-28 16:06:57 -07:00

arch-x86_64

Merge remote-tracking branch 'goog/lmp-mr1-ub-dev' into manualmerge

2014-10-28 16:06:57 -07:00

bionic

Don't mask out SA_RESTORER from sa_flags.

2014-10-28 07:55:53 -07:00

dns

am 6c5694b6: Merge "Migrate system/extra getaddrinfo test, and fix a bug in getservbyname(3)."

2014-10-28 04:33:09 +00:00

include

am 43ec1fb7: am a4c0b756: Merge "Add mkfifoat(3)."

2014-10-29 17:13:26 +00:00

kernel

am d5e1c583: Merge "Move to v3.16.3 kernel headers."

2014-09-18 21:48:49 +00:00

private

resolved conflicts for merge of ae69a958 to lmp-mr1-dev-plus-aosp

2014-10-02 12:17:32 -07:00

stdio

Add back symbols to fix Greed for Glory franchise.

2014-10-09 22:23:50 -07:00

tools

am d11eac34: Force export symbols on all x86 variants in libc.

2014-10-07 00:20:10 +00:00

tzcode

Merge remote-tracking branch 'goog/lmp-mr1-ub-dev' into manualmerge

2014-10-28 16:06:57 -07:00

upstream-dlmalloc

Return total footprint, not high water mark.

2014-10-13 12:45:35 -07:00

upstream-freebsd

Update our FreeBSD realpath(3) to upstream head.

2014-09-30 16:40:41 -07:00

upstream-netbsd

Switch to OpenBSD insque/remque/killpg.

2014-09-23 14:06:56 -07:00

upstream-openbsd

Switch to OpenBSD fopen/fclose.

2014-09-24 11:14:36 -07:00

zoneinfo

Update bionic to tzdata2014i.

2014-10-22 13:45:25 -07:00

Android.mk

Merge "Never use ASAN."

2014-10-21 18:28:19 +00: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 NOTICE files.

2014-09-13 09:42:41 -07:00

SYSCALLS.TXT

Add clock_settime and clock_nanosleep.

2014-10-13 17:04:10 -07:00