am 4d32a367: am 2787ba25: Merge "Register EGLExt JNI methods" into jb-mr2-dev

author Jesse Hall <jessehall@google.com>

Tue, 7 May 2013 17:18:38 +0000 (10:18 -0700)

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

Tue, 7 May 2013 17:18:38 +0000 (10:18 -0700)
author Jesse Hall <jessehall@google.com>
Tue, 7 May 2013 17:18:38 +0000 (10:18 -0700)
committer Android Git Automerger <android-git-automerger@android.com>
Tue, 7 May 2013 17:18:38 +0000 (10:18 -0700)
diff --cc core/jni/Android.mk
Simple merge
diff --cc core/jni/AndroidRuntime.cpp
Simple merge
author	Jesse Hall <jessehall@google.com>
	Tue, 7 May 2013 17:18:38 +0000 (10:18 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Tue, 7 May 2013 17:18:38 +0000 (10:18 -0700)
		1	2
core/jni/Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/jni/AndroidRuntime.cpp	patch \|	diff1 \|	diff2 \|	blob \| history