Gloria Wang 273ebe4d4a am d686c31b: Merge "To support uri started with http:// in some Java APIs Fix for bug 4016388." into honeycomb-mr1 ... * commit 'd686c31bf3da56378e174265889db9bca8e636a3': To support uri started with http:// in some Java APIs Fix for bug 4016388.		2011-03-07 13:32:27 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Joystick tweaks. (DO NOT MERGE)	2011-03-04 19:12:41 -08:00
libs	Joystick tweaks. (DO NOT MERGE)	2011-03-04 19:12:41 -08:00
opengl	am fa238f03: Merge "egl: fixes for object refcounts" into gingerbread	2011-02-23 12:46:57 -08:00
services/surfaceflinger	remove some logs	2011-03-02 18:45:50 -08:00
vpn	Make VpnService synchronous API.	2011-01-20 12:51:43 +08: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