OSDN Git Service

resolved conflicts for merge of 78df7b5e to master
authorJesse Hall <jessehall@google.com>
Mon, 6 May 2013 23:04:53 +0000 (16:04 -0700)
committerJesse Hall <jessehall@google.com>
Mon, 6 May 2013 23:04:53 +0000 (16:04 -0700)
commit9ee0999bcbe7fbd596462a7e1f4351ebf1c4cc97
tree3e07f0396953263295c39aab70b78b30043b95c9
parent72bd95b8feb7ef41eb5dd00003b1aed8f30f4abe
parent78df7b5e7841100fe1fecc0e2c5241e4bc5a776d
resolved conflicts for merge of 78df7b5e to master

Change-Id: I27076f5e6f747a006dcac7cd334cacf56dd57bd5
api/current.txt
core/jni/android_opengl_EGL14.cpp