Bjorn Bringert f69a946209 Merge "ActivityManager exposes launch count API."		2011-02-23 02:30:57 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Add new axes for joysticks and mouse wheels.	2011-02-19 05:23:10 -08:00
libs	Add new hover move action and scroll wheel plumbing.	2011-02-19 06:14:21 -08:00
opengl	Clean up use of HAVE_ANDROID_OS	2011-02-16 10:56:32 -08:00
services/surfaceflinger	fix a surface leak in SurfaceFlinger	2011-02-16 15:31:07 -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