Benoit Goby 9034a564a1 resolved conflicts for merge of 31659471 to master ... Change-Id: Ib49a1ef39455af8b01c3feb7fcb5393e0a4ceec9		2011-04-11 19:07:11 -07:00
cmds	Add keychain user with special keystore access permissions	2011-04-08 14:06:39 -07: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