Derek Sollenberger a467e15fb6 Merge "Skia Merge (revision 808)"		2011-02-24 05:27:34 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Remove RefBase.h dependency on TextOutput.h	2011-02-22 18:08:58 -08:00
libs	Remove RefBase.h dependency on TextOutput.h	2011-02-22 18:08:58 -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
NOTICE	resolved conflicts for merge of 00118a48 to honeycomb-merge	2011-01-27 18:25:32 -08:00