Adam Powell 1435ff84f6 Merge "Fix bug 5091886 - action bar measurement"		2011-08-25 11:49:13 -07:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	SurfaceFlinger: use the HWC gralloc usage bit	2011-08-22 14:56:29 -07:00
libs	Fix an issue where Surface::lock() would never update the output region	2011-08-23 21:18:36 -07:00
opengl	implement EGL_TEXTURE_EXTERNAL_OES in libagl	2011-08-18 16:26:21 -07:00
services/surfaceflinger	Merge "Fix Recent thumbnails aren't taken when leaving an activity via notification"	2011-08-24 17:53:21 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00