Iliyan Malchev 796fb04d32 Merge changes I5c61ac40,I67c40a3c,I3e2ddd01 ... * changes: frameworks/base: switch CameraService to a HAL module frameworks/base: make the ANativeWindow query() method const frameworks/base: include system/core header camera.h in Camera.h		2011-05-03 16:38:07 -07:00
cmds	Replace a custom AndroidRuntime::findClass with a more targeted fix.	2011-04-13 16:43:15 -07:00
include	frameworks/base: make the ANativeWindow query() method const	2011-05-03 15:49:40 -07:00
libs	frameworks/base: make the ANativeWindow query() method const	2011-05-03 15:49:40 -07:00
opengl	remove last traces of copybit	2011-05-02 16:27:21 -07:00
services/surfaceflinger	Merge "Fix a race-condtion in SurfaceFlinger that could lead to a crash."	2011-05-03 16:34:06 -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