Eric Fischer 5c657f7e4e am cfb05dc6: (-s ours) am 9ac82606: (-s ours) am c0604255: Merge "Import revised translations. DO NOT MERGE" into gingerbread ... * commit 'cfb05dc67e4fd8c0c078d31bf5404ad915b80030': Import revised translations. DO NOT MERGE		2011-03-18 16:58:44 -07:00
cmds
include	Merge "Refactor how timeouts are calculated."	2011-03-17 20:16:42 -07:00
libs	Merge "Refactor how timeouts are calculated."	2011-03-17 20:16:42 -07:00
opengl	Merge "GLES2Debugger: Make command exchange async to improve performance."	2011-03-17 14:38:37 -07:00
services/surfaceflinger	am 14438b81: am 970bad67: am be368de7: Merge "Fix missing AOSP copyright headers for more files" into honeycomb-mr1	2011-03-17 18:06:51 -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