The Android Automerger f30fe1e818 merge in jb-release history after reset to master		2012-03-21 07:03:38 -07:00
cmds/surfaceflinger	Move keystore to system/security repo	2012-02-15 15:55:21 -08:00
include	Merge "libgui: have ST::updateTexImage check the GL ctx"	2012-03-20 12:03:29 -07:00
libs	Merge "libgui: have ST::updateTexImage check the GL ctx"	2012-03-20 12:03:29 -07:00
opengl	gltrace: Only accept connections from the shell.	2012-03-15 16:41:35 -07:00
services/surfaceflinger	surfaceflinger: use display dpi if not forced with ro.sf.lcd_nensity	2012-03-14 17:15:10 -07:00
MODULE_LICENSE_APACHE2
NOTICE