am b2f55103: am 4bad2d21: Merge "Add more support for GLOBAL_CONLYFLAGS."

author Stephen Hines <srhines@google.com>

Tue, 2 Dec 2014 19:01:41 +0000 (19:01 +0000)

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

Tue, 2 Dec 2014 19:01:41 +0000 (19:01 +0000)
author Stephen Hines <srhines@google.com>
Tue, 2 Dec 2014 19:01:41 +0000 (19:01 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Tue, 2 Dec 2014 19:01:41 +0000 (19:01 +0000)
diff --cc core/binary.mk
Simple merge
diff --cc core/definitions.mk
Simple merge
author	Stephen Hines <srhines@google.com>
	Tue, 2 Dec 2014 19:01:41 +0000 (19:01 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Tue, 2 Dec 2014 19:01:41 +0000 (19:01 +0000)
		1	2
core/binary.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/definitions.mk	patch \|	diff1 \|	diff2 \|	blob \| history