am 3dae0ee4: Fix inherited dependency when instrmentation.

author Ying Wang <wangying@google.com>

Fri, 3 Sep 2010 17:21:37 +0000 (10:21 -0700)

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

Fri, 3 Sep 2010 17:21:37 +0000 (10:21 -0700)
author Ying Wang <wangying@google.com>
Fri, 3 Sep 2010 17:21:37 +0000 (10:21 -0700)
committer Android Git Automerger <android-git-automerger@android.com>
Fri, 3 Sep 2010 17:21:37 +0000 (10:21 -0700)
diff --cc core/base_rules.mk
Simple merge
diff --cc core/clear_vars.mk
Simple merge
diff --cc core/definitions.mk
Simple merge
author	Ying Wang <wangying@google.com>
	Fri, 3 Sep 2010 17:21:37 +0000 (10:21 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 3 Sep 2010 17:21:37 +0000 (10:21 -0700)
		1	2
core/base_rules.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/clear_vars.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/definitions.mk	patch \|	diff1 \|	diff2 \|	blob \| history