Joe Fernandez 1db92ad48e am e2b98cf3: am c6e3f6f1: am 566328a2: Merge "docs: NDK overview, remove x86 instruction set mention (b/6044027)" into ics-mr1 ... * commit 'e2b98cf359c82a2c4181c1d9cd1d9130bd96be66':		2012-02-23 18:49:41 -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