Mathias Agopian 222ae987aa Merge "resolved conflicts for merge of a0f011ff to master"		2010-12-07 22:57:04 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Add support for fallback keycodes.	2010-12-07 17:35:26 -08:00
libs	Add support for fallback keycodes.	2010-12-07 17:35:26 -08:00
opengl	Merge "Fix another set of out-of-date headers."	2010-12-07 16:39:45 -08:00
services/surfaceflinger	resolved conflicts for merge of a0f011ff to master	2010-12-07 22:53:40 -08:00
vpn
MODULE_LICENSE_APACHE2
NOTICE	Add missing NOTICE entries.	2010-10-19 16:56:02 -07:00