Jean-Baptiste Queru 8f767cf93c am 88d7300d: (-s ours) am d4c8cec0: am 9720323a: (-s ours) Merge "Delete browerplugin tests - do not merge" ... * commit '88d7300d2abaf638c2c0b5505b657b401f881c14': Delete browerplugin tests - do not merge		2011-01-29 09:35:55 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Fix crashes caused by some input devices.	2011-01-25 16:02:22 -08:00
libs	am 2a8f8d57: Merge "Quiet the SurfaceFlingerClient dequeueBuffer error." into honeycomb	2011-01-28 14:15:44 -08:00
opengl	egl: clear error on function entry	2011-01-25 15:36:21 -08:00
services/surfaceflinger	fix [3389263] OMX.Nvidia.h264.decode fails to shutdown	2011-01-28 18:23:24 -08:00
vpn	Make VpnService synchronous API.	2011-01-20 12:51:43 +08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00