Jim Miller 8a95411bba Merge "Fix 5288804: Make music trasports in lockscreen more closely match design" into ics-mr0		2011-10-18 17:49:28 -07:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	Merge "SensorManager reconnects to sensor service when the later dies" into ics-mr0	2011-10-17 15:50:36 -07:00
libs	Merge "SensorManager reconnects to sensor service when the later dies" into ics-mr0	2011-10-17 15:50:36 -07:00
opengl	don't log EGL errors due to unimplemented proprietary extensions	2011-10-05 19:15:32 -07:00
services/surfaceflinger	Revert "Add a LayerScreenshot"	2011-10-16 23:54:25 -07:00
MODULE_LICENSE_APACHE2	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00