ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
552 Commits 2 Branches 0 Tags 54 MiB
C++ 79%
C 14.1%
Java 3.2%
Python 1.4%
Makefile 1%
Other 1.1%
7be3e5d2d8
Go to file
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
awt auto import from //depot/cupcake/@135843 2009-03-03 19:31:44 -08:00
camera/libcameraservice Remove debug messages. 2009-04-22 16:22:01 +08:00
cmds auto import from //depot/cupcake/@135843 2009-03-03 19:31:44 -08:00
im/java/android/im auto import from //depot/cupcake/@135843 2009-03-03 19:31:44 -08:00
include Merge commit 'goog/master' into merge_master 2009-04-30 14:43:18 -07:00
libs Merge commit 'goog/master' into merge_master 2009-04-30 14:43:18 -07:00
opengl Merge commit 'goog/master' into merge_master 2009-04-30 14:43:18 -07:00
MODULE_LICENSE_APACHE2 auto import from //depot/cupcake/@135843 2009-03-03 19:31:44 -08:00
NOTICE auto import from //depot/cupcake/@135843 2009-03-03 19:31:44 -08:00