Jean-Baptiste Queru 2f7b9bf2d1 am 5bb3129c: (-s ours) am a2616220: am 5e57c2cf: Merge "Stagefright: Return error if codec takes too long to return a buffer." ... * commit '5bb3129c7eabce34d7c1469826e1795d4b225bb3': Stagefright: Return error if codec takes too long to return a buffer.		2011-08-01 14:10:39 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	resolved conflicts for merge of b7f09f28 to honeycomb-plus-aosp	2011-07-29 14:16:18 -04:00
libs	resolved conflicts for merge of b7f09f28 to honeycomb-plus-aosp	2011-07-29 14:16:18 -04:00
opengl	fix [4107131] nvidia driver call takes a very long time	2011-03-16 14:19:03 -07:00
services/surfaceflinger	am 48294b0d: am e7d3ee9d: Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)	2011-06-16 18:15:19 -07:00
vpn	VpnService: stop VPN when unknown DNS servers show up.	2011-07-08 17:59:54 -07:00
MODULE_LICENSE_APACHE2	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00