Merge "Temporarily use a separate var for including shared resources"

author Adam Lesinski <adamlesinski@google.com>

Wed, 26 Mar 2014 00:41:00 +0000 (00:41 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Wed, 26 Mar 2014 00:41:00 +0000 (00:41 +0000)
author Adam Lesinski <adamlesinski@google.com>
Wed, 26 Mar 2014 00:41:00 +0000 (00:41 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 26 Mar 2014 00:41:00 +0000 (00:41 +0000)
diff --cc core/base_rules.mk
Simple merge
diff --cc core/clear_vars.mk
Simple merge
author	Adam Lesinski <adamlesinski@google.com>
	Wed, 26 Mar 2014 00:41:00 +0000 (00:41 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 26 Mar 2014 00:41:00 +0000 (00:41 +0000)
		1	2
core/base_rules.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/clear_vars.mk	patch \|	diff1 \|	diff2 \|	blob \| history