Dianne Hackborn 36e5f667bc resolved conflicts for merge of 2eb12a47 to master ...

Change-Id: I79eb9d9f083e51ec1b99145d81632683669e7a99

2010-06-24 16:29:54 -07:00

..

include

Added support for the GL_TEXTURE_EXTERNAL target

2010-06-15 17:31:17 -07:00

java

Some ActivityThread/ActivityManager cleanup.

2010-06-24 15:20:48 -07:00

libagl

Recover a handful of commits that were reverted earlier

2010-06-21 13:46:59 -07:00

libs

update GL ES stub libraries with the new GL ES headers

2010-06-09 18:20:21 -07:00

tests

am e52d66fa: am 44bea8f8: Merge changes I00274431,I83be9404,I0359531a,Iceef1e95 into kraken

2010-06-09 19:57:01 -07:00

tools/glgen

Add OpenGL ES 2.0 VBO versions glDrawElements and glVertexAttribPointer.

2010-06-22 20:08:40 +08:00