Steven Ross 989be2ec04 Merge "Making KeyguardView slippery fixes 5501105"		2011-11-14 16:56:46 -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	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