git.osdn.net Git - android-x86/dalvik.git/commitdiff

author	Guang Zhu <guangzhu@google.com>
	Tue, 20 Apr 2010 23:37:58 +0000 (16:37 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Tue, 20 Apr 2010 23:37:58 +0000 (16:37 -0700)

Merge commit '7e3d5fcddef15bf2dff71c2fe5ee794536819973' into dalvik-dev

* commit '7e3d5fcddef15bf2dff71c2fe5ee794536819973':
include emma into core library on conditional flag

		1	2
libcore/JavaLibrary.mk	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge

dalvik

About OSDN

Find Software

Develop Software

Help