Conley Owens a767c44489 am 7dcdfd79: am f26ec38c: am 501f7bca: Merge "Eliminating dead logic - bitmap state simply cannot be null here." ... * commit '7dcdfd7988d1e57c7a705a2d7294e8bfa2b8afc9': Eliminating dead logic - bitmap state simply cannot be null here.		2011-04-29 15:11:45 -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 "libgui: enable tests in the 'tests' build."	2011-04-28 15:03:56 -07:00
opengl	get rid of dependency on copybit HAL module	2011-04-28 19:50:21 -07:00
services/surfaceflinger	am ba5aebd1: am ac505b86: am f0556bb9: am 86d1d747: Merge "Add lock before calling initEglImage"	2011-04-27 13:54:08 -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