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

..

atom

Replace ambiguous cmp instruction with cmpl.

2014-08-27 15:04:23 -07:00

bionic

Ensure __set_errno is still visible on LP32.

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

generic

Remove the unused swab.S.

2014-07-22 20:43:55 -07:00

include/machine

Simplify _ALIGN_TEXT.

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

silvermont

Regenerate the bionic NOTICE files.

2014-07-07 15:42:06 -07:00

syscalls

Ensure __set_errno is still visible on LP32.

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

x86.mk

Fix pthread_getattr_np for the main thread.

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