Eric Fischer b6d2b82685 am c9e5464b: (-s ours) am b8c7c66d: am 0664a4b1: am b42e83b1: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb ... * commit 'c9e5464b06aa6abb8db60094483a0d353515fb67': Import revised translations. DO NOT MERGE		2011-03-29 16:59:35 -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	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