Teng-Hui Zhu 1ce21b999e am 4e790ee1: (-s ours) am 29fa50be: am bb55777b: Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1 ... * commit '4e790ee1894118a1ab2032d09e5016fa9414dae7': DO NOT MERGE : cherry pick of change Ieb7ae26b from master DO NOT MERGE : cherry pick of change I0f9f2c65 from master		2011-04-07 14:27:03 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Merge "remove more unused references to ISurface"	2011-04-06 12:22:29 -07:00
libs	Merge "Coalesce input events that arrive faster than 333Hz."	2011-04-07 13:18:38 -07:00
opengl	Initialize reference counter for egl_display_t	2011-03-31 16:52:02 -07:00
services/surfaceflinger	remove more unused references to ISurface	2011-04-05 20:11:55 -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