Elliott Hughes 10f2093f3b Merge remote branch 'goog/master' into mm ... Plus a hack in cpu-features.h to avoid errors like this: bionic/libc/arch-arm/bionic/strcpy.S: Assembler messages: bionic/libc/arch-arm/bionic/strcpy.S:42: Error: bad instruction `pld(r1, #0)' (The alternative would probably have been to pull in the build change that defines __ASSEMBLY__, but I don't want to do any more than necessary.) Change-Id: Idad9665eb8cf5ef6a093c85d3098d11a37f5ac6a		2010-12-16 19:09:51 -08:00
..
bionic	resolved conflicts for merge of 1bc98ccb to gingerbread-plus-aosp	2010-11-22 13:34:59 -08:00
include	Merge remote branch 'goog/master' into mm	2010-12-16 19:09:51 -08:00
syscalls	libc: Add ftruncate64 and improve 64-bit parameter syscall handling.	2010-12-16 17:04:41 +01:00
syscalls.mk	libc: Add ftruncate64 and improve 64-bit parameter syscall handling.	2010-12-16 17:04:41 +01:00