Nick Kralevich 603b6c1975 Merge "remove unused code."		2012-12-12 12:43:19 -08:00
build	Fix issue #7271589: Cannot set Ocean HD live wallpaper	2012-10-03 11:27:19 -07:00
cmds	Merge "remove unused code."	2012-12-12 12:43:19 -08:00
data/etc	Add android.hardware.camera.any feature to camera permissions.	2012-09-23 09:53:51 -07:00
include	Merge "SurfaceTextureClient: remove a deprecated ctor"	2012-12-12 12:16:21 -08:00
libs	Merge "SurfaceTextureClient: remove a deprecated ctor"	2012-12-12 12:16:21 -08:00
opengl	Use LOCAL_REQUIRED_MODULES to establish dependency	2012-12-04 12:04:44 -08:00
services	Merge "SurfaceFlinger: Move GraphicBufferAlloc to libgui"	2012-12-12 10:56:42 -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