Jean-Baptiste Queru 3d7ab176d6 resolved conflicts for merge of f601ce2c to master ...

Change-Id: I9e880aacef9d949d83945d41ee5b6eb63ddc4cc7

2010-07-02 07:46:21 -07:00

..

include

Introduce official public NativeWindow type.

2010-06-30 15:32:04 -07:00

java

Some ActivityThread/ActivityManager cleanup.

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

libagl

am c6e1d880: Merge "Introduce official public NativeWindow type." into gingerbread

2010-06-30 16:08:24 -07:00

libs

update GL ES stub libraries with the new GL ES headers

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

tests

resolved conflicts for merge of f601ce2c to master

2010-07-02 07:46:21 -07:00

tools/glgen

Add OpenGL ES 2.0 VBO versions glDrawElements and glVertexAttribPointer.

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