Kristian Monsen 74bba4e8c3 Merge "Part of fix for bug 4997380: Some error types unknown to SslError"		2011-07-28 06:50:40 -07: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	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00