Ben Murdoch 6a9fa5fa73 resolved conflicts for merge of d2607118 to master ... Change-Id: Id6092a762af775e9b5db390feaba3e10bd98ef7c		2010-12-01 10:55:18 +00:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Ensure the ShortcutManager uses the correct key character map.	2010-11-30 18:50:17 -08:00
libs	Ensure the ShortcutManager uses the correct key character map.	2010-11-30 18:50:17 -08:00
opengl	Hardware Composer Stress Test	2010-11-29 14:08:57 -08:00
services/surfaceflinger	Merge "Implement reducing the buffer count of a Surface."	2010-11-11 15:26:21 -08:00
vpn
MODULE_LICENSE_APACHE2
NOTICE	Add missing NOTICE entries.	2010-10-19 16:56:02 -07:00