Merge "Update build rule for executable with PRIVATE_ALL_WHOLE_STATIC_LIBRARIES"

author Jean-Baptiste Queru <jbq@google.com>

Mon, 21 May 2012 14:30:15 +0000 (07:30 -0700)

committer android code review <noreply-gerritcodereview@google.com>

Mon, 21 May 2012 14:30:17 +0000 (07:30 -0700)
author Jean-Baptiste Queru <jbq@google.com>
Mon, 21 May 2012 14:30:15 +0000 (07:30 -0700)
committer android code review <noreply-gerritcodereview@google.com>
Mon, 21 May 2012 14:30:17 +0000 (07:30 -0700)
diff --cc core/combo/TARGET_linux-arm.mk
Simple merge
diff --cc core/combo/TARGET_linux-x86.mk
Simple merge
author	Jean-Baptiste Queru <jbq@google.com>
	Mon, 21 May 2012 14:30:15 +0000 (07:30 -0700)
committer	android code review <noreply-gerritcodereview@google.com>
	Mon, 21 May 2012 14:30:17 +0000 (07:30 -0700)
		1	2
core/combo/TARGET_linux-arm.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/combo/TARGET_linux-x86.mk	patch \|	diff1 \|	diff2 \|	blob \| history