am 3be47af9: am b3f59bde: am 86a90364: Merge "core/binary.mk: Add missing Objective...

author David 'Digit' Turner <digit@android.com>

Tue, 15 Feb 2011 19:03:57 +0000 (11:03 -0800)

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

Tue, 15 Feb 2011 19:03:57 +0000 (11:03 -0800)
author David 'Digit' Turner <digit@android.com>
Tue, 15 Feb 2011 19:03:57 +0000 (11:03 -0800)
committer Android Git Automerger <android-git-automerger@android.com>
Tue, 15 Feb 2011 19:03:57 +0000 (11:03 -0800)
diff --cc core/binary.mk
Simple merge
diff --cc core/definitions.mk
Simple merge
author	David 'Digit' Turner <digit@android.com>
	Tue, 15 Feb 2011 19:03:57 +0000 (11:03 -0800)
committer	Android Git Automerger <android-git-automerger@android.com>
	Tue, 15 Feb 2011 19:03:57 +0000 (11:03 -0800)
		1	2
core/binary.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/definitions.mk	patch \|	diff1 \|	diff2 \|	blob \| history