Wink Saville b2531a836b Resolve merge conflicts for merge of 21083066 to master. ... Change-Id: Ief83f7abdd3396af965fb86ad6815e16ce36ff5c		2011-05-02 12:13:44 -07:00
cmds	Replace a custom AndroidRuntime::findClass with a more targeted fix.	2011-04-13 16:43:15 -07:00
include	get rid of dependency on copybit HAL module	2011-04-28 19:50:21 -07:00
libs	Merge "Implement support for ALT and SHIFT modifiers"	2011-04-29 09:59:55 -07:00
opengl	get rid of dependency on copybit HAL module	2011-04-28 19:50:21 -07:00
services/surfaceflinger	am 08acaec6: am a47c0d29: am 58e4a5e2: Merge "Fixed to draw texture when loadTexture() is called at first time"	2011-05-02 10:12:00 -07:00
vpn	Make VpnService synchronous API.	2011-01-20 12:51:43 +08:00
MODULE_LICENSE_APACHE2
NOTICE