am 45a3ad7d: Merge c1efb060

author Jean-Baptiste Queru <jbq@google.com>

Wed, 8 Jun 2011 01:20:25 +0000 (18:20 -0700)

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

Wed, 8 Jun 2011 01:20:25 +0000 (18:20 -0700)
author Jean-Baptiste Queru <jbq@google.com>
Wed, 8 Jun 2011 01:20:25 +0000 (18:20 -0700)
committer Android Git Automerger <android-git-automerger@android.com>
Wed, 8 Jun 2011 01:20:25 +0000 (18:20 -0700)
diff --cc core/config.mk
Simple merge
diff --cc core/main.mk
Simple merge
author	Jean-Baptiste Queru <jbq@google.com>
	Wed, 8 Jun 2011 01:20:25 +0000 (18:20 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Wed, 8 Jun 2011 01:20:25 +0000 (18:20 -0700)
		1	2
core/config.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/main.mk	patch \|	diff1 \|	diff2 \|	blob \| history