Merge "Add LOCAL_LOGTAGS_FILES that prebuilts can use" am: 476b5b1616

author Dan Willemsen <dwillemsen@google.com>

Wed, 1 Jun 2016 23:53:44 +0000 (23:53 +0000)

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

Wed, 1 Jun 2016 23:53:44 +0000 (23:53 +0000)
author Dan Willemsen <dwillemsen@google.com>
Wed, 1 Jun 2016 23:53:44 +0000 (23:53 +0000)
committer android-build-merger <android-build-merger@google.com>
Wed, 1 Jun 2016 23:53:44 +0000 (23:53 +0000)
diff --cc core/base_rules.mk
Simple merge
diff --cc core/clear_vars.mk
Simple merge
author	Dan Willemsen <dwillemsen@google.com>
	Wed, 1 Jun 2016 23:53:44 +0000 (23:53 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 1 Jun 2016 23:53:44 +0000 (23:53 +0000)
		1	2
core/base_rules.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/clear_vars.mk	patch \|	diff1 \|	diff2 \|	blob \| history