am 4ed19f0f: am 1e63c2d1: Merge "Add dalvik.vm.dex2oat-flags for eng build"

author Brian Carlstrom <bdc@google.com>

Thu, 8 May 2014 21:57:32 +0000 (21:57 +0000)

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

Thu, 8 May 2014 21:57:32 +0000 (21:57 +0000)
author Brian Carlstrom <bdc@google.com>
Thu, 8 May 2014 21:57:32 +0000 (21:57 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Thu, 8 May 2014 21:57:32 +0000 (21:57 +0000)
diff --cc CleanSpec.mk
Simple merge
diff --cc core/main.mk
Simple merge
author	Brian Carlstrom <bdc@google.com>
	Thu, 8 May 2014 21:57:32 +0000 (21:57 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Thu, 8 May 2014 21:57:32 +0000 (21:57 +0000)
		1	2
CleanSpec.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/main.mk	patch \|	diff1 \|	diff2 \|	blob \| history