Merge "Add <error.h>."

author Elliott Hughes <enh@google.com>

Mon, 26 Jan 2015 20:38:46 +0000 (20:38 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Mon, 26 Jan 2015 20:38:46 +0000 (20:38 +0000)
author Elliott Hughes <enh@google.com>
Mon, 26 Jan 2015 20:38:46 +0000 (20:38 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 26 Jan 2015 20:38:46 +0000 (20:38 +0000)
diff --cc libc/Android.mk
Simple merge
diff --cc tests/Android.mk
Simple merge
author	Elliott Hughes <enh@google.com>
	Mon, 26 Jan 2015 20:38:46 +0000 (20:38 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Mon, 26 Jan 2015 20:38:46 +0000 (20:38 +0000)
		1	2
libc/Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history
tests/Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history