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

resolved conflicts for merge of 7efad83d to lmp-dev-plus-aosp

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

include/machine

Simplify _ALIGN_TEXT.

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

string

Unify our assembler macros.

2014-02-20 13:51:26 -08:00

syscalls

resolved conflicts for merge of 7efad83d to lmp-dev-plus-aosp

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

mips64.mk

Revert "Replaces vfork() implementation with fork()"

2014-08-06 12:32:22 -07:00