Stephen Hines 25775d4739 Merge "Clean up simple integer operations." into honeycomb		2011-01-17 14:09:49 -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	Implement SurfaceTexture frame-available callback.	2011-01-16 17:28:39 -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
NOTICE	Fix omission in NOTICE file.	2011-01-17 12:50:15 -08:00