Mike Lockwood 8890a546d8 Merge "Change UsbManager.requestPermission to only grant permission temporarily" into honeycomb-mr1		2011-03-09 10:44:19 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Merge "Add support for partial invalidates in WebView Bug #3461349" into honeycomb-mr1	2011-03-07 22:40:27 -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
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00