am 4cd5703b: am 75b64a1b: am ca483765: Merge "Fix the duplication in the debugging...

author Elliott Hughes <enh@google.com>

Tue, 22 Jan 2013 18:05:19 +0000 (10:05 -0800)

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

Tue, 22 Jan 2013 18:05:19 +0000 (10:05 -0800)
author Elliott Hughes <enh@google.com>
Tue, 22 Jan 2013 18:05:19 +0000 (10:05 -0800)
committer Android Git Automerger <android-git-automerger@android.com>
Tue, 22 Jan 2013 18:05:19 +0000 (10:05 -0800)
diff --cc libc/Android.mk
Simple merge
diff --cc linker/Android.mk
Simple merge
author	Elliott Hughes <enh@google.com>
	Tue, 22 Jan 2013 18:05:19 +0000 (10:05 -0800)
committer	Android Git Automerger <android-git-automerger@android.com>
	Tue, 22 Jan 2013 18:05:19 +0000 (10:05 -0800)
		1	2
libc/Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history
linker/Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history