Gilles Debunne 84f8b09038 Merge "Bug 5014726: Paste works in ExtractedText"		2011-07-15 09:41:16 -07:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	Merge changes Id9aa1003,I8c154189	2011-07-14 17:54:27 -07:00
libs	Merge "Add a call to pthread_attr_destroy to avoid potential memory leaks."	2011-07-14 22:31:27 -07:00
opengl	Merge "Remove the simulator target from all makefiles. Bug: 5010576"	2011-07-12 12:15:07 -07:00
services/surfaceflinger	take the state transform into account with h/w composer hal	2011-07-12 14:51:45 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00