Daniel Sandler 94bf8d25f5 resolved conflicts for merge of 31796297 to master ... Change-Id: Ice632b3378f8f67c186245fdb63b022ade864ba1		2011-02-07 16:12:16 -05: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 421d94c2: am ecb4b3f0: Merge "Pass the IGraphicBufferAlloc to SurfaceTextureClient." into honeycomb	2011-02-02 16:21:24 -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
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00