am 449831f8: am 340e9691: Merge "Include <string.h> for memset."

* commit '449831f8b3dce8a6773ebd80b6eacce4c65d36a6':
  Include <string.h> for memset.
This commit is contained in:
Elliott Hughes
2015-01-26 22:09:43 +00:00
committed by Android Git Automerger

View File

@@ -16,6 +16,8 @@
#include "SurfaceTextureRenderer.h"
#include <string.h>
#include <GLES2/gl2ext.h>
const GLfloat g_vVertices[] = {
-1.f, -1.f, 0.0f, 1.0f, // Position 0