satok 12362d0229 am 33bdc3c9: (-s ours) am d9435bce: am b4788fdb: Do not merge. Backport two fixes for InputMethethodFramework ... * commit '33bdc3c9995cbef477cec756b65d767558e6b836': Do not merge. Backport two fixes for InputMethethodFramework		2011-05-20 07:03:38 -07:00
cmds	Replace a custom AndroidRuntime::findClass with a more targeted fix.	2011-04-13 16:43:15 -07:00
include	resolved conflicts for merge of 06a8ceac to master	2011-05-19 21:44:52 -07:00
libs	resolved conflicts for merge of 06a8ceac to master	2011-05-19 21:44:52 -07:00
opengl	eglTerminate() now actually frees up all active egl objects	2011-05-16 19:03:33 -07:00
services/surfaceflinger	Merge "Fix a race that could cause GL commands to be executed from the wrong thread."	2011-05-19 19:42:20 -07:00
vpn	Make VpnService synchronous API.	2011-01-20 12:51:43 +08:00
MODULE_LICENSE_APACHE2
NOTICE