Dianne Hackborn 189752708c resolved conflicts for merge of 34706a4c to master ... Change-Id: I4dd24f3b917aa7e3d2c4b0fae51e951dfcf88ba8		2012-02-24 16:37:35 -08:00
cmds/surfaceflinger	Move keystore to system/security repo	2012-02-15 15:55:21 -08:00
include	deprecate L_8, LA_88 and RGB_332 in sdk	2012-02-24 14:58:36 -08:00
libs	deprecate L_8, LA_88 and RGB_332 in sdk	2012-02-24 14:58:36 -08:00
opengl	gltrace: Trace thread time and wall clock time.	2012-02-17 11:09:47 -08:00
services/surfaceflinger	deprecate L_8, LA_88 and RGB_332 in sdk	2012-02-24 14:58:36 -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