Andy McFadden db2e4f16bb am a90173d8: am 762a6d86: Merge "DO NOT MERGE - native_fence_sync: fix an enum name" into jb-mr1.1-dev ... * commit 'a90173d86dd209aee55d833c73c424d854a98c70': DO NOT MERGE - native_fence_sync: fix an enum name		2012-11-27 11:39:20 -08:00
..
include	am a151a19d: Merge "Fix return type of glGetAttribLocation and glGetUniformLocation"	2012-11-06 20:41:34 -08:00
libagl	Merge "egl: Reintroduce eglGetRenderBufferANDROID"	2012-10-05 13:14:29 -07:00
libs	am c859084c: am a9a4cd48: gltrace: Make sure device is debuggable.	2012-11-20 20:01:30 -08:00
specs	DO NOT MERGE - native_fence_sync: fix an enum name	2012-11-26 14:26:31 -08:00
tests	am a151a19d: Merge "Fix return type of glGetAttribLocation and glGetUniformLocation"	2012-11-06 20:41:34 -08:00
tools/glgen	am a151a19d: Merge "Fix return type of glGetAttribLocation and glGetUniformLocation"	2012-11-06 20:41:34 -08:00