Huahui Wu 381e05df74 am f5cf85d0: am d1e89c41: am b1c43c32: Merge "b/4116658 Fix the jumpy scrolling with some flash site." into honeycomb-mr1 ... * commit 'f5cf85d07c99ae834d1b58bf5109982f9a4f3604': b/4116658 Fix the jumpy scrolling with some flash site.		2011-03-17 18:47:21 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Merge "Add support for timestamps into SurfaceTexture."	2011-03-17 15:52:34 -07:00
libs	Merge "Add support for timestamps into SurfaceTexture."	2011-03-17 15:52:34 -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