Gilles Debunne 23820f6a89 resolved conflicts for merge of 8e28ab22 to honeycomb-plus-aosp ... Change-Id: Ic590c75a6d4475cc0a35f1af8687a4ee8846f20b		2011-02-10 14:43:35 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am ecb4b3f0: Merge "Pass the IGraphicBufferAlloc to SurfaceTextureClient." into honeycomb	2011-02-02 15:56:20 -08:00
libs	am c2efcd2c: Merge "Initialize the SurfaceTexture transform fields." into honeycomb	2011-02-04 15:05:28 -08:00
opengl	Fix a multithreading bug in libagl's EGL.	2011-01-30 15:59:36 -08:00
services/surfaceflinger	[3418265] apply layer transformations to the DimLayer.	2011-02-02 16:05:39 -08:00
vpn	Make VpnService synchronous API.	2011-01-20 12:51:43 +08: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