Eric Laurent 1a2c7098c8 resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp ... Change-Id: I0d52f183f2a37b31b0d69c3846e94ea8d2cca09b		2011-01-17 14:17:12 -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	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00