Mike Lockwood f27b62fb90 resolved conflicts for merge of 22c140b7 to master ... Change-Id: I1d57d76519d7a8d8ea7c5be4f49ef885f1ffb302		2011-05-18 09:25:49 -04: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	Make VpnService synchronous API.	2011-01-20 12:51:43 +08:00
MODULE_LICENSE_APACHE2
NOTICE