Derek Sollenberger 569d6c278e resolved conflicts for merge of 13639b0d to master ... Change-Id: I6fb2ac2702fc662c1892537de6d4db20d5e709d6		2011-07-29 14:39:06 -04:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	Merge "Move extract native libraries to JNI code"	2011-07-27 15:54:51 -07:00
libs	Merge "Fix uses of all-subdir-makefiles"	2011-07-27 18:29:26 -07:00
opengl	Add new OpenGL test	2011-07-19 17:20:35 -07:00
services/surfaceflinger	remove dead code and member variables.	2011-07-25 20:03:43 -07:00
MODULE_LICENSE_APACHE2
NOTICE