Mike Lockwood 022329127c Merge changes I7df1ff78,Ibc2e8adf into honeycomb ... * changes: MediaScanner: Make sure name field is set for file based playlists MTP: Fix problem with MTP starting up on the first try.		2011-01-18 20:30:13 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Merge "integrate videoeditor preview player." into honeycomb	2011-01-17 10:52:23 -08:00
libs	fix [3361121] hang in glClear() - device unresponsive, OTA fails	2011-01-18 15:51:30 -08:00
opengl	egl: fix GetProcAddress for EGLimage extensions	2011-01-16 18:12:04 -08:00
services/surfaceflinger	Add logs when taking a screenshot to help tracking issue 3361121	2011-01-16 17:25:26 -08:00
vpn	Revert "Remove the APIs for the old encryption scheme."	2011-01-13 14:15:43 -06: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-17 12:50:15 -08:00