Jeff Brown 455c66e7ff Merge "Simplify spot tracking logic. Bug: 4124987" into honeycomb-mr2		2011-06-06 20:31:55 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)	2011-06-06 15:14:25 -07:00
libs	merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)	2011-06-06 15:14:25 -07:00
opengl	fix [4107131] nvidia driver call takes a very long time	2011-03-16 14:19:03 -07:00
services/surfaceflinger	merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)	2011-06-06 15:14:25 -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