am 69c3f457: am dc7fee9f: Set up rules to merge AndroidManifest.xmls

author Ying Wang <wangying@google.com>

Thu, 6 Feb 2014 18:11:51 +0000 (18:11 +0000)

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

Thu, 6 Feb 2014 18:11:51 +0000 (18:11 +0000)
author Ying Wang <wangying@google.com>
Thu, 6 Feb 2014 18:11:51 +0000 (18:11 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Thu, 6 Feb 2014 18:11:51 +0000 (18:11 +0000)
diff --cc core/clear_vars.mk
Simple merge
diff --cc core/config.mk
Simple merge
author	Ying Wang <wangying@google.com>
	Thu, 6 Feb 2014 18:11:51 +0000 (18:11 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Thu, 6 Feb 2014 18:11:51 +0000 (18:11 +0000)
		1	2
core/clear_vars.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/config.mk	patch \|	diff1 \|	diff2 \|	blob \| history