Romain Guy 7acfd6f683 Merge "Fix text redering issue where the text was sometimes truncated"		2011-03-24 18:09:28 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	retire android_native_window_t	2011-03-23 16:43:20 -07:00
libs	Include strings.h for the strcasecmp prototype.	2011-03-21 20:26:25 -07:00
opengl	Merge "GLESv2Dbg: ability to create GL calls from client"	2011-03-24 16:43:02 -07:00
services/surfaceflinger	am bd340c7b: am b368f4d8: am 38caff23: Merge "SurfaceFlinger: Fix a typo." into honeycomb-mr1	2011-03-18 17:38:37 -07: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 adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00