Romain Guy 3e875c3891 am fbef58fa: am 258f32e2: Merge "Disable plugins if setPluginsEnabled(false) called." ... * commit 'fbef58faad5a31faf36294e4d160cbd148ed5458': Disable plugins if setPluginsEnabled(false) called.		2011-06-07 15:09:02 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am bbbab26e: am 2c180499: Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2	2011-06-06 20:36:49 -07:00
libs	am bbbab26e: am 2c180499: Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2	2011-06-06 20:36:49 -07:00
opengl	fix [4107131] nvidia driver call takes a very long time	2011-03-16 14:19:03 -07:00
services/surfaceflinger	am a6a4a9ed: am f6c82067: fix a surface leak introduced by a failed merge (DO NOT MERGE)	2011-06-07 15:02:53 -07:00
vpn	Make VpnService synchronous API.	2011-01-20 12:51:43 +08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of 00118a48 to honeycomb-merge	2011-01-27 18:25:32 -08:00