Kenny Root 81bc567745 resolved conflicts for merge of 18490fb9 to master ... Change-Id: I6c68e6fb0f9c1182a955689bbffc161a8f30bd37		2011-04-12 12:51:08 -07:00
cmds	Add keychain user with special keystore access permissions	2011-04-08 14:06:39 -07:00
include	resolved conflicts for merge of 18490fb9 to master	2011-04-12 12:51:08 -07:00
libs	resolved conflicts for merge of 18490fb9 to master	2011-04-12 12:51:08 -07:00
opengl	Kill the global references in the OpenGL wrappers.	2011-04-11 15:31:20 -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	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	resolved conflicts for merge of 00118a48 to honeycomb-merge	2011-01-27 18:25:32 -08:00