Dianne Hackborn 598eafd564 Merge "Fix issue #4869092: ResolverActivity occasionally fails to display"		2011-07-19 14:07:54 -07:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	Add set_scaling_mode() to ANativeWindow.	2011-07-19 13:05:11 -07:00
libs	use SurfaceTexture new scaling mode in SF	2011-07-19 13:05:12 -07:00
opengl	EGL: update EGL_ANDROID_recordable extension.	2011-07-17 18:42:09 -07:00
services/surfaceflinger	use SurfaceTexture new scaling mode in SF	2011-07-19 13:05:12 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00