Adam Powell cdce06d931 resolved conflicts for merge of 2b6ace58 to master ... Change-Id: Icaff26a56c3e467317ca16d71e61fe8c5e60dfda		2011-05-17 13:41:24 -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	Fix a race in SurfaceFlinger that could cause layers to be leaked forever.	2011-05-03 20:44:51 -07:00
vpn	Make VpnService synchronous API.	2011-01-20 12:51:43 +08:00
MODULE_LICENSE_APACHE2
NOTICE