Tsu Chiang Chuang f6611b1e17 am 7b306ae2: am 90cfe0f2: am 2d559b53: Merge "fix NPE in race condition." into ics-mr1 ... * commit '7b306ae225b0a7337972f4d8bff51e8f79be3a03':		2012-02-23 08:34:56 -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
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00