Marco Nelissen 0129f1a27f resolved conflicts for merge of b9783b49 to honeycomb-plus-aosp ... Change-Id: I1d86ea56b3d1d1b69f6671e5b0df0ca3f0c79643		2011-06-06 09:55:15 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	resolved conflicts for merge of b9783b49 to honeycomb-plus-aosp	2011-06-06 09:55:15 -07:00
libs	resolved conflicts for merge of b9783b49 to honeycomb-plus-aosp	2011-06-06 09:55:15 -07:00
opengl	fix [4107131] nvidia driver call takes a very long time	2011-03-16 14:19:03 -07:00
services/surfaceflinger	resolved conflicts for merge of b9783b49 to honeycomb-plus-aosp	2011-06-06 09:55:15 -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