Santosh Madhava 3cb3346451 Merge "Fix for 3431967: Memory leak from video editor engine in JNI"		2011-02-10 09:41:27 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am 421d94c2: am ecb4b3f0: Merge "Pass the IGraphicBufferAlloc to SurfaceTextureClient." into honeycomb	2011-02-02 16:21:24 -08:00
libs	am c7839751: am c2efcd2c: Merge "Initialize the SurfaceTexture transform fields." into honeycomb	2011-02-07 13:47:02 -08:00
opengl	Merge "Clear all EGL errors when entering EGL funcs."	2011-01-31 15:40:06 -08:00
services/surfaceflinger	am 50b029d5: am 7ba35f5a: Merge "[3418265] apply layer transformations to the DimLayer." into honeycomb	2011-02-02 16:46:46 -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 00118a48 to honeycomb-merge	2011-01-27 18:25:32 -08:00