Mike Lockwood 9169158b3d am afd1c014: Merge "SqliteDatabase: Fix local reference leak in custom_function_callback()" into honeycomb-mr1 ... * commit 'afd1c0143dfa63bd133e3a4163cc9cc4216e3514': SqliteDatabase: Fix local reference leak in custom_function_callback()		2011-03-15 13:42:35 -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	SurfaceTexture: disallow unsupported uses.	2011-03-15 10:37:37 -07:00
opengl	SurfaceTexture: disallow unsupported uses.	2011-03-15 10:37:37 -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