Elliott Hughes 090cb44b94 Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base		2011-10-17 11:32:08 -07:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base	2011-10-17 11:32:08 -07:00
libs	Merge changes I4e5ff00c,Id5e3ca1d,I97cbba61	2011-10-17 11:31:39 -07:00
opengl	don't log EGL errors due to unimplemented proprietary extensions	2011-10-05 19:15:32 -07:00
services/surfaceflinger	Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base	2011-10-17 11:32:08 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00