Jean-Baptiste Queru 26603203b6 Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise."		2011-04-25 13:33:37 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Runtime resource overlay, iteration 1.	2011-04-01 14:12:10 +02:00
libs	Runtime resource overlay, iteration 1.	2011-04-01 14:12:10 +02:00
opengl	Merge from gingerbread	2011-03-29 13:54:43 -07:00
services/surfaceflinger	am 239fd805: Merge "fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)" into gingerbread	2011-01-25 14:46:40 -08:00
vpn	Phase 2 of test cleanup: moving test files from AndroidTests closer to their sources.	2010-01-29 13:35:51 -08:00
MODULE_LICENSE_APACHE2	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	Fix omission in NOTICE file.	2011-01-18 15:25:32 -08:00