Brad Fitzpatrick 64505d4233 am cd7dfcec: (-s ours) am 40b207c1: Merge "Using proper key for removing object from the map." ... * commit 'cd7dfcec4b9a059cd67783c8abed72f74c03c4b0': Using proper key for removing object from the map.		2011-03-15 11:42:53 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	SurfaceTextureClient: Add ISurfaceTexture getter.	2011-03-14 17:47:11 -07:00
libs	SurfaceTextureClient: Add ISurfaceTexture getter.	2011-03-14 17:47:11 -07:00
opengl	gl2_yuvtex: use the gralloc-provided stride.	2011-03-14 11:30:02 -07:00
services/surfaceflinger	SurfaceFlinger: Respect the PROTECTED gralloc bit.	2011-03-10 16:25:48 -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