Vasu Nori 531ef77165 Merge "bug:3435895 change a couple of retryable error constants to < 400"		2011-02-08 22:01:39 -08:00
cmds
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
NOTICE	resolved conflicts for merge of 00118a48 to honeycomb-merge	2011-01-27 18:25:32 -08:00