am 2d72094f: am 960d919e: resolved conflicts for merge of 4df82b3e to klp-dev-plus...

author Ying Wang <wangying@google.com>

Sat, 8 Feb 2014 18:37:33 +0000 (18:37 +0000)

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

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