Andreas Huber 37f1a39f3b Merge "Small fix to MediaCodec"		2012-02-24 10:16:28 -08:00
cmds/surfaceflinger	Move keystore to system/security repo	2012-02-15 15:55:21 -08:00
include	am 32916f7a: am fc4215ee: am 2d03a93e: Merge "Xcode 4.3 compatibility checkin"	2012-02-23 12:22:35 -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	workaround for an issue where the screen would flicker sometimes	2012-02-23 21:20:01 -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