Adam Powell 600caa99a6 resolved conflicts for merge of 961f8bef to master ... Change-Id: I9b437ddbebb10cf3ccf579b6b13e6c86bd73900c		2011-05-18 17:32:16 -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 "Disable error report temporarily to enable inline video"	2011-05-18 14:43:53 -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	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00