Matthew Xie 97532391ed Merge "when disconnectHeadsetInternal, allow it when the BT is not disabled"		2011-07-20 19:08:38 -07:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	Merge "clean-up. get rid ofunused code and members in Surface[Control].cpp"	2011-07-20 18:52:51 -07:00
libs	Merge "clean-up. get rid ofunused code and members in Surface[Control].cpp"	2011-07-20 18:52:51 -07:00
opengl	Add new OpenGL test	2011-07-19 17:20:35 -07:00
services/surfaceflinger	clean-up. get rid ofunused code and members in Surface[Control].cpp	2011-07-20 16:53:13 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00