Bart Sears a129d4434f am 7cad54cb: (-s ours) am 35137d66: (-s ours) am 6a19759c: Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread ... * commit '7cad54cb8283b67e5d4106112772dc038b7dbb40': Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread		2011-03-29 13:23:55 -07:00
cmds
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 "GLES2Dbg: use 256KB chunks for lzf compression"	2011-03-29 12:00:07 -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