ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity
7be3e5d2d8
replicant-frameworks_native/libs
History
Mathias Agopian 7be3e5d2d8 Merge commit 'goog/master' into merge_master 
Conflicts:
	libs/surfaceflinger/Layer.cpp
	libs/surfaceflinger/SurfaceFlinger.cpp
	opengl/libagl/egl.cpp
	opengl/libs/EGL/egl.cpp
	opengl/libs/GLES_CM/gl.cpp
	opengl/libs/GLES_CM/gl_api.in
	opengl/libs/gl_entries.in
	opengl/libs/tools/glapigen
2009-04-30 14:43:18 -07:00
..
audioflinger Merge donut into master 2009-04-22 17:12:34 -07:00
surfaceflinger Merge commit 'goog/master' into merge_master 2009-04-30 14:43:18 -07:00
ui Merge commit 'goog/master' into merge_master 2009-04-30 14:43:18 -07:00
utils Merge commit 'goog/master' into merge_master 2009-04-30 14:43:18 -07:00