Merge "Reference nativehelper/jni.h as jni.h" am: 28c9177f66 am: 6ac4d2a42b am: 9cd65...

author Steven Moreland <smoreland@google.com>

Tue, 18 Jul 2017 22:06:08 +0000 (22:06 +0000)

committer android-build-merger <android-build-merger@google.com>

Tue, 18 Jul 2017 22:06:08 +0000 (22:06 +0000)
author Steven Moreland <smoreland@google.com>
Tue, 18 Jul 2017 22:06:08 +0000 (22:06 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 18 Jul 2017 22:06:08 +0000 (22:06 +0000)
diff --cc opengl/tests/gl2_jni/jni/gl_code.cpp
Simple merge
diff --cc opengl/tests/gl_jni/jni/gl_code.cpp
Simple merge
diff --cc opengl/tests/gl_perfapp/jni/gl_code.cpp
Simple merge
diff --cc opengl/tests/gldual/jni/gl_code.cpp
Simple merge
author	Steven Moreland <smoreland@google.com>
	Tue, 18 Jul 2017 22:06:08 +0000 (22:06 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 18 Jul 2017 22:06:08 +0000 (22:06 +0000)
		1	2
opengl/tests/gl2_jni/jni/gl_code.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
opengl/tests/gl_jni/jni/gl_code.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
opengl/tests/gl_perfapp/jni/gl_code.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
opengl/tests/gldual/jni/gl_code.cpp	patch \|	diff1 \|	diff2 \|	blob \| history