Jean-Baptiste Queru 46b0fc9b2d am 5e57c2cf: Merge "Stagefright: Return error if codec takes too long to return a buffer." ... * commit '5e57c2cf83ef62e9887592b46a4c3352662fb988': Stagefright: Return error if codec takes too long to return a buffer.		2011-08-01 13:55:45 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am 01caec8c: Merge "Adding an optional param to the SurfaceTexture constructor."	2011-07-29 09:50:11 -07:00
libs	am 3cf03987: Merge "Continue idmap generation even if name lookup fails."	2011-07-21 13:09:05 -07:00
opengl	Merge from gingerbread	2011-03-29 13:54:43 -07:00
services/surfaceflinger	am afffa8fa: fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)	2011-06-15 14:13:04 -07:00
vpn	Phase 2 of test cleanup: moving test files from AndroidTests closer to their sources.	2010-01-29 13:35:51 -08:00
MODULE_LICENSE_APACHE2
NOTICE	Fix omission in NOTICE file.	2011-01-18 15:25:32 -08:00