Peter Ng e438db9e6a Merge "Convert the outer lockscreen ring to a shape drawable."		2011-10-25 16:33:24 -07:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	Rename (IF_)LOG() to (IF_)ALOG() DO NOT MERGE	2011-10-25 16:28:24 +01:00
libs	Rename (IF_)LOG() to (IF_)ALOG() DO NOT MERGE	2011-10-25 16:28:24 +01:00
opengl	don't log EGL errors due to unimplemented proprietary extensions	2011-10-05 19:15:32 -07:00
services/surfaceflinger	Merge "Fix software GL renderer."	2011-10-21 16:22:15 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00