Xavier Ducrohet 7434d28600 am 54c8c3d9: (-s ours) am b3c780f1: am 816b873d: Move the automatic namespace outside of the res namespace. do not merge. ... * commit '54c8c3d920ee863716638483602a011943da6484': Move the automatic namespace outside of the res namespace. do not merge.		2012-02-23 18:47:08 -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	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