Adam Powell 3933bcd76f am f2004180: am f5abccef: am 73a31ec9: Merge "New opaque cab assets; search dialog tweaks." into honeycomb-mr2 ... * commit 'f2004180f828584fa8525081a248e8c0f2055327': New opaque cab assets; search dialog tweaks.		2011-05-20 13:13:28 -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	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00