Romain Guy 92dd47f283 Merge changes Ia8a15db8,I20ac5203 ... * changes: Don't enable hardware acceleration when the app owns the surface. Bug #3323096 Make FrameLayout support mixed wrap_content/match_parent children. Bug #3259668		2011-01-05 10:32:15 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Mouse pointer integration.	2011-01-04 17:31:24 -08:00
libs	Mouse pointer integration.	2011-01-04 17:31:24 -08:00
opengl	egl: fixes for object refcounts	2010-12-23 16:12:19 -08:00
services/surfaceflinger	fix a small bug that caused screenshot to show garbage in some cases	2010-12-16 18:47:29 -08:00
vpn
MODULE_LICENSE_APACHE2
NOTICE	Add missing NOTICE entries.	2010-10-19 16:56:02 -07:00