Dianne Hackborn f543d5de23 resolved conflicts for merge of 0e59729b to master ... Change-Id: I2d3a6bddf66b1df0c101c45ea2fec1cf65caf01b		2011-05-12 15:39:41 -07:00
cmds	Replace a custom AndroidRuntime::findClass with a more targeted fix.	2011-04-13 16:43:15 -07:00
include	fix onFrameAvailable	2011-05-11 18:01:51 -07:00
libs	fix onFrameAvailable	2011-05-11 18:01:51 -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	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00