Adam Powell ec9ee068e5 resolved conflicts for merge of f61c3d07 to master ... Change-Id: Id38b4ff3ccc677b2d9e743186473b3559b00119b		2011-05-18 10:33:20 -07:00
cmds	Replace a custom AndroidRuntime::findClass with a more targeted fix.	2011-04-13 16:43:15 -07:00
include	Add initial API for stylus and mouse buttons.	2011-05-13 12:11:17 -07:00
libs	Merge "Full backup tweaks"	2011-05-13 15:41:32 -07:00
opengl	fix (Again) adding OES postfix when looking for gl functions	2011-05-11 20:37:47 -07:00
services/surfaceflinger	SurfaceFlinger: unfreeze windows for fixed size buffers.	2011-05-16 16:59:04 -07:00
vpn
MODULE_LICENSE_APACHE2
NOTICE