Elliott Hughes 938473a7f0 resolved conflicts for merge of 7efad83d to lmp-dev-plus-aosp ...

Change-Id: I3994c3c69e187e08d69642e097de14b5040c5b3b

2014-09-08 16:21:24 -07:00

..

bionic

Ensure __set_errno is still visible on LP32.

2014-09-08 15:36:21 -07:00

include/machine

Simplify _ALIGN_TEXT.

2014-08-20 13:11:58 -07:00

string

Fix for slm-tuned memmove (both 32- and 64-bit).

2014-06-05 11:08:09 -07:00

syscalls

Ensure __set_errno is still visible on LP32.

2014-09-08 15:36:21 -07:00

x86_64.mk

Fix pthread_getattr_np for the main thread.

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