Jeff Brown b2be540457 am fd47c5ee: (-s ours) am f0210c36: Merge "Joystick tweaks. (DO NOT MERGE)" into honeycomb-mr1 ... * commit 'fd47c5eea2a4393b5c9897bb80db721809146aaf': Joystick tweaks. (DO NOT MERGE)		2011-03-07 11:52:07 -08:00
cmds
include	Joystick tweaks.	2011-03-04 18:53:32 -08:00
libs	Joystick tweaks.	2011-03-04 18:53:32 -08:00
opengl	Clean up use of HAVE_ANDROID_OS	2011-02-16 10:56:32 -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
GenerationCache.h	Add TextLayout Cache	2011-03-02 13:29:20 -08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of 00118a48 to honeycomb-merge	2011-01-27 18:25:32 -08:00