bionic

History

Elliott Hughes 16b557e1b2 Merge remote-tracking branch 'goog/lmp-mr1-ub-dev' into manualmerge

Conflicts:
	libc/arch-arm/bionic/__restore.S
	libc/arch-arm/cortex-a15/bionic/stpcpy.S
	libc/arch-arm/cortex-a9/bionic/stpcpy.S
	libc/arch-arm64/generic/bionic/memcpy_base.S
	libc/arch-x86/bionic/__restore.S
	libc/arch-x86/x86.mk
	libc/arch-x86_64/bionic/__restore_rt.S
	tests/stack_unwinding_test.cpp
	tests/stack_unwinding_test_impl.c

Change-Id: I2cb250ad78e9da6f390bc279aec742564b75e6c7

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

asctime.c

Use snprintf(3) instead of sprintf(3).

2014-10-08 17:10:26 -07:00

difftime.c

Upgrade to tzcode2013f plus Android modifications (from tzcode2013d plus Android modifications).

2013-09-27 00:04:30 -07:00

localtime.c

Disable tzdata in $ANDROID_DATA.

2014-10-27 13:38:21 -07:00

private.h

Build tzcode with -Werror.