Jeff Brown 218e7c74e6 Add joystick support to framework. ... Change-Id: I95374436708752e1a9cff3f85c5b9bc3e0987961		2011-01-17 13:51:00 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Add joystick support to framework.	2011-01-17 13:51:00 -08:00
libs	Merge "Fix the ISurfaceComposer onTransact switch."	2011-01-16 17:31:42 -08:00
opengl	Hardware Composer Test hwcCommit set blend type	2011-01-10 18:03:05 -08:00
services/surfaceflinger	Merge "partially fix [3306150] HTML5 video with H/W acceleration blackout" into honeycomb	2011-01-14 19:27:38 -08:00
vpn	Revert "Remove the APIs for the old encryption scheme."	2011-01-13 14:15:43 -06:00
MODULE_LICENSE_APACHE2
NOTICE	Fix merge conflict for 'c506ab89'	2011-01-13 11:48:42 -08:00