am 3002d64b: Merge "Everyone has a TLS register."

author Elliott Hughes <enh@google.com>

Wed, 13 Feb 2013 16:11:24 +0000 (08:11 -0800)

committer Android Git Automerger <android-git-automerger@android.com>

Wed, 13 Feb 2013 16:11:24 +0000 (08:11 -0800)
author Elliott Hughes <enh@google.com>
Wed, 13 Feb 2013 16:11:24 +0000 (08:11 -0800)
committer Android Git Automerger <android-git-automerger@android.com>
Wed, 13 Feb 2013 16:11:24 +0000 (08:11 -0800)
diff --cc libc/Android.mk
Simple merge
diff --cc linker/Android.mk
Simple merge
author	Elliott Hughes <enh@google.com>
	Wed, 13 Feb 2013 16:11:24 +0000 (08:11 -0800)
committer	Android Git Automerger <android-git-automerger@android.com>
	Wed, 13 Feb 2013 16:11:24 +0000 (08:11 -0800)
		1	2
libc/Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history
linker/Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history