Wink Saville 02619cbcc8 resolved conflicts for merge of 99cd6671 to master ... Change-Id: I81ac18b1b8291a96bdfa3386f2fe3633fd7eeb79		2011-07-12 13:56:05 -07:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	Merge "EGL: fix the ANativeWindow size/fmt override"	2011-07-11 15:47:20 -07:00
libs	Merge "Remove the simulator target from all makefiles. Bug: 5010576"	2011-07-12 12:15:07 -07:00
opengl	Merge "Remove the simulator target from all makefiles. Bug: 5010576"	2011-07-12 12:15:07 -07:00
services/surfaceflinger	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00