am 834ec0ea: am d3ddfdf8: am b3bed595: Merge "Add a dummy build recipe for generated...

author Ying Wang <wangying@google.com>

Wed, 28 May 2014 23:45:29 +0000 (23:45 +0000)

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

Wed, 28 May 2014 23:45:29 +0000 (23:45 +0000)
author Ying Wang <wangying@google.com>
Wed, 28 May 2014 23:45:29 +0000 (23:45 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Wed, 28 May 2014 23:45:29 +0000 (23:45 +0000)
diff --cc core/binary.mk
Simple merge
diff --cc core/definitions.mk
Simple merge
author	Ying Wang <wangying@google.com>
	Wed, 28 May 2014 23:45:29 +0000 (23:45 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Wed, 28 May 2014 23:45:29 +0000 (23:45 +0000)
		1	2
core/binary.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/definitions.mk	patch \|	diff1 \|	diff2 \|	blob \| history