Bart Sears 86f26506a1 am b227cce3: Merge "Check MediaPlayer state, do not teardown() from UI thread." into ics-mr0 ... * commit 'b227cce31641c39a1a586739561b4776019945a4': Check MediaPlayer state, do not teardown() from UI thread.		2011-10-17 11:30:52 -07:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	am 57337eb7: Merge "Add a LayerScreenshot" into ics-mr0	2011-10-17 11:30:33 -07:00
libs	Merge "Deprecate local-only CursorWindows."	2011-10-14 21:05:58 -07:00
opengl	don't log EGL errors due to unimplemented proprietary extensions	2011-10-05 19:15:32 -07:00
services/surfaceflinger	Add a LayerScreenshot	2011-10-14 14:32:48 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00