Merge "Add NATIVE_TESTS class, move host native tests" am: e72fc63901

author Dan Willemsen <dwillemsen@google.com>

Tue, 7 Jun 2016 00:09:39 +0000 (00:09 +0000)

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

Tue, 7 Jun 2016 00:09:39 +0000 (00:09 +0000)
author Dan Willemsen <dwillemsen@google.com>
Tue, 7 Jun 2016 00:09:39 +0000 (00:09 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 7 Jun 2016 00:09:39 +0000 (00:09 +0000)
diff --cc core/base_rules.mk
Simple merge
diff --cc core/binary.mk
Simple merge
diff --cc core/definitions.mk
Simple merge
diff --cc core/envsetup.mk
Simple merge
diff --cc core/main.mk
Simple merge
diff --cc core/prebuilt_internal.mk
Simple merge
author	Dan Willemsen <dwillemsen@google.com>
	Tue, 7 Jun 2016 00:09:39 +0000 (00:09 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 7 Jun 2016 00:09:39 +0000 (00:09 +0000)
		1	2
core/base_rules.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/binary.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/definitions.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/envsetup.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/main.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/prebuilt_internal.mk	patch \|	diff1 \|	diff2 \|	blob \| history