Jim Miller 3592cdf075 Merge "Fix 3419077: Allow subclasses to change SeekBarPreference action buttons." into honeycomb		2011-02-03 18:39:39 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Pass the IGraphicBufferAlloc to SurfaceTextureClient.	2011-02-02 15:31:47 -08:00
libs	Pass the IGraphicBufferAlloc to SurfaceTextureClient.	2011-02-02 15:31:47 -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
NOTICE	resolved conflicts for merge of 00118a48 to honeycomb-merge	2011-01-27 18:25:32 -08:00