John Wang e42adac546 am 6504d74b: am 72a31ab9: Merge "[maguro] Fix STK issues" into ics-mr1 ... * commit '6504d74b8f7b98f7c2d5fb550042c644510d5f34': [maguro] Fix STK issues		2011-11-14 12:14:09 -08:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	am 738d8cae: am c93a151f: Merge "Define, document, and test the behavior of very large SurfaceTextures" into ics-mr1	2011-11-14 11:54:38 -08:00
libs	am 738d8cae: am c93a151f: Merge "Define, document, and test the behavior of very large SurfaceTextures" into ics-mr1	2011-11-14 11:54:38 -08:00
opengl	Merge "Terminate EGL when an app goes in the background" into ics-mr1	2011-11-10 17:10:41 -08:00
services/surfaceflinger	Back to 59fps	2011-11-09 17:54:37 -08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00