OSDN Git Service

resolved conflicts for merge of 5477d0e4 to master
authorJesse Hall <jessehall@google.com>
Thu, 11 Jul 2013 16:40:35 +0000 (09:40 -0700)
committerJesse Hall <jessehall@google.com>
Thu, 11 Jul 2013 16:40:54 +0000 (09:40 -0700)
commit94cdba97ce1de140623d84c14fb15f12f7da89dd
tree9aa7938076985494ffdd1289dd78227808904694
parentbb7272f137ad3558bba5ee3a31dcfe4f41cc797f
parent5477d0e4e858df1ea9cb1b6965a160fb5fe23b57
resolved conflicts for merge of 5477d0e4 to master

Change-Id: I7ca75a44018a68bf3a7ac1de17a3ef568a48d2ac
opengl/libs/EGL/Loader.cpp
opengl/libs/EGL/eglApi.cpp