Brad Fitzpatrick 517e03c621 am 5db7fd6b: am f7a9b869: am 1e7fb7ae: Merge "Error in compound cache-control header." ... * commit '5db7fd6b70f47f31fbc59f92907b9807f9c4e64d': Error in compound cache-control header.		2011-03-30 16:38:18 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Revert "retire android_native_window_t"	2011-03-30 15:28:21 -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