Gilles Debunne 84ccc0395a Merge "Removed unnecessary memory allocation in TextView."		2011-03-08 10:22:20 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am d00353fe: am bc8a8e8c: Merge "Add support for partial invalidates in WebView Bug #3461349" into honeycomb-mr1	2011-03-07 22:45:52 -08:00
libs	Joystick tweaks. (DO NOT MERGE)	2011-03-04 19:12:41 -08:00
opengl	Clean up use of HAVE_ANDROID_OS	2011-02-16 10:56:32 -08:00
services/surfaceflinger	remove some logs	2011-03-02 18:45:50 -08:00
vpn	Make VpnService synchronous API.	2011-01-20 12:51:43 +08:00
GenerationCache.h	Add TextLayout Cache	2011-03-02 13:29:20 -08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of 00118a48 to honeycomb-merge	2011-01-27 18:25:32 -08:00