Merge \\"Rewrite LDLIBS and SHARED_LIBRARIES\\" am: a8d13592ac

author Dan Willemsen <dwillemsen@google.com>

Wed, 8 Jun 2016 21:17:05 +0000 (21:17 +0000)

committer android-build-merger <android-build-merger@google.com>

Wed, 8 Jun 2016 21:17:05 +0000 (21:17 +0000)
author Dan Willemsen <dwillemsen@google.com>
Wed, 8 Jun 2016 21:17:05 +0000 (21:17 +0000)
committer android-build-merger <android-build-merger@google.com>
Wed, 8 Jun 2016 21:17:05 +0000 (21:17 +0000)
diff --cc core/binary.mk
Simple merge
diff --cc core/config.mk
Simple merge
author	Dan Willemsen <dwillemsen@google.com>
	Wed, 8 Jun 2016 21:17:05 +0000 (21:17 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 8 Jun 2016 21:17:05 +0000 (21:17 +0000)
		1	2
core/binary.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/config.mk	patch \|	diff1 \|	diff2 \|	blob \| history