Jean-Baptiste Queru dbe61dfa77 merge 83fdc69e from gingerbread - do not merge ... Change-Id: Ib1e9e12244a44f75a93d66142e71915de6386680		2011-01-14 18:33:51 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am a2977c38: Merge changes Ie03796ae,Ide3e980a into gingerbread	2010-12-07 14:22:56 -08:00
libs	am bec4abaa: Merge "Fix issue 3302649." into gingerbread	2011-01-12 13:52:42 -08:00
opengl	am e1752f41: Merge "fix [3258603] \'Quadrant\' benchmark crashes inside eglQueryContext on GB/Crespo" into gingerbread	2010-12-08 16:20:23 -08:00
services/surfaceflinger	am c724f2fb: disable the bypass mode. DO NOT MERGE.	2010-12-20 11:30:23 -08:00
vpn
MODULE_LICENSE_APACHE2
NOTICE	Adding ASL2 attribution for VisualOn.	2011-01-13 09:24:30 -08:00