James Dong ed8d7e66ba Merge "libstagefright: Add error handling in AMRNB deooder"		2011-03-14 14:43:24 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Use touch pad gestures to manipulate the pointer.	2011-03-14 14:12:03 -07:00
libs	Use touch pad gestures to manipulate the pointer.	2011-03-14 14:12:03 -07:00
opengl	GLES2Debugger: Added DbgContext and vertex data capturing.	2011-03-10 16:40:37 -08:00
services/surfaceflinger	Fix some const-ness and comments	2011-03-11 17:01:40 -08: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