Jamie Gennis a0d1fc054e Merge "Revert "Merge "Expand on the SurfaceTexture API docs."""		2011-02-24 16:48:15 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Merge "Fix some issues with RefBase debugging."	2011-02-24 16:23:51 -08:00
libs	Merge "Fix some issues with RefBase debugging."	2011-02-24 16:23:51 -08:00
opengl	Clean up use of HAVE_ANDROID_OS	2011-02-16 10:56:32 -08:00
services/surfaceflinger	Merge "Correctly handle translucency of device-specific pixel formats"	2011-02-23 14:10:04 -08:00
vpn	Make VpnService synchronous API.	2011-01-20 12:51:43 +08:00
MODULE_LICENSE_APACHE2	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00