Robert Greenwalt 2f5ec4057b am 026ba931: (-s ours) Merge "Fix the build." into honeycomb-plus-aosp ... * commit '026ba931d448919ffc515f7e66fe96950f89d22e': Fix the build.		2011-03-31 10:53:58 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Merge "Add input filter mechanism for accessibility."	2011-03-30 17:20:56 -07:00
libs	merge libsurfaceflinger_client into libgui	2011-03-25 18:42:40 -07:00
opengl	Merge "Add a simple OpenGL ES 2.0 test program that displays a camera preview stream."	2011-03-29 13:34:03 -07:00
services/surfaceflinger	merge libsurfaceflinger_client into libgui	2011-03-25 18:42:40 -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