Jean-Baptiste Queru 94c289d3f3 am 4b3ec09b: am 99ccf407: am c2461eb3: Merge "Add support for bmp and wav content types in MMS" ... * commit '4b3ec09b8199d3c70fbb025a73e8f0a46dcd22c9': Add support for bmp and wav content types in MMS		2012-02-23 07:29:42 -08:00
cmds/surfaceflinger	Move keystore to system/security repo	2012-02-15 15:55:21 -08:00
include	remove libui's dependency on libpixelflinger	2012-02-21 18:56:08 -08:00
libs	Merge "libui: add ability to force a framebuffer format for EGL's use"	2012-02-22 16:00:49 -08:00
opengl	gltrace: Trace thread time and wall clock time.	2012-02-17 11:09:47 -08:00
services/surfaceflinger	Merge "createSurface getpid() first parameter was removed"	2012-02-21 07:24:16 -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