am 3208b615: am fc8b6338: resolved conflicts for merge of d65a7da3 to jb-mr2-dev...

author Ying Wang <wangying@google.com>

Thu, 15 Aug 2013 21:42:57 +0000 (14:42 -0700)

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

Thu, 15 Aug 2013 21:42:57 +0000 (14:42 -0700)
author Ying Wang <wangying@google.com>
Thu, 15 Aug 2013 21:42:57 +0000 (14:42 -0700)
committer Android Git Automerger <android-git-automerger@android.com>
Thu, 15 Aug 2013 21:42:57 +0000 (14:42 -0700)
diff --cc core/binary.mk
Simple merge
diff --cc core/combo/TARGET_linux-arm.mk
Simple merge
diff --cc core/combo/TARGET_linux-mips.mk
Simple merge
diff --cc core/combo/TARGET_linux-x86.mk
Simple merge
author	Ying Wang <wangying@google.com>
	Thu, 15 Aug 2013 21:42:57 +0000 (14:42 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Thu, 15 Aug 2013 21:42:57 +0000 (14:42 -0700)
		1	2
core/binary.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/combo/TARGET_linux-arm.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/combo/TARGET_linux-mips.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/combo/TARGET_linux-x86.mk	patch \|	diff1 \|	diff2 \|	blob \| history