Guang Zhu 12921dd9d9 am 44060f4d: Merge "when test case times out, stop loading first" into honeycomb ... * commit '44060f4d76e7625cf2ae6580afa606613ef1cb49': when test case times out, stop loading first		2011-01-14 16:29:30 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Fix remote GraphicBuffer allocation in SurfaceFlinger.	2011-01-13 12:19:04 -08:00
libs	Fix remote GraphicBuffer allocation in SurfaceFlinger.	2011-01-13 12:19:04 -08:00
opengl	Hardware Composer Test hwcCommit set blend type	2011-01-10 18:03:05 -08:00
services/surfaceflinger	Merge "fix [3312683] Camera mirroring problem after switching from back to front camera" into honeycomb	2011-01-14 10:54:47 -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 merge conflict for 'c506ab89'	2011-01-13 11:48:42 -08:00