Romain Guy 6f12148de0 Merge "Allow Canvas.setBitmap() to receive a null Bitmap."		2011-08-01 17:42:36 -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 "connect/disconnect is now called from our EGL wrapper"	2011-08-01 16:36:02 -07:00
opengl	connect/disconnect is now called from our EGL wrapper	2011-08-01 14:06:20 -07:00
services/surfaceflinger	Merge "SurfaceFlinger: use async mode for video & cam"	2011-08-01 13:40:29 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00