Jesse Hall 073e40031c resolved conflicts for merge of c765e79a to master ...

Change-Id: Id7018ac9f551ec8b224f030d8b04229ac2407a17

2012-02-27 14:12:32 -08:00

..

Android.mk

…

ClientAPIExts.cpp

…

ClientAPIExts.h

…

ClientAPIExts.in

…

egl_ftable.h

should fix sdk build

2011-11-15 21:09:15 -08:00

egl.cfg

egl.cfg can now only have a single entry

2012-02-13 20:38:35 -08:00

egl.cpp

resolved conflicts for merge of c765e79a to master

2012-02-27 14:12:32 -08:00

eglContext.h

…

eglDisplay.cpp

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

2012-01-09 10:39:43 +00:00

eglDisplay.h

…