Andy McFadden 3325fe16e6 Merge "Refactor SurfaceTexture a bit."		2012-12-11 13:13:32 -08:00
build	Fix issue #7271589: Cannot set Ocean HD live wallpaper	2012-10-03 11:27:19 -07:00
cmds	atrace: fix the help string	2012-12-07 16:29:03 -08:00
data/etc	Add android.hardware.camera.any feature to camera permissions.	2012-09-23 09:53:51 -07:00
include	Refactor SurfaceTexture a bit.	2012-12-11 09:42:51 -08:00
libs	Refactor SurfaceTexture a bit.	2012-12-11 09:42:51 -08:00
opengl	Use LOCAL_REQUIRED_MODULES to establish dependency	2012-12-04 12:04:44 -08:00
services	Refactor SurfaceTexture a bit.	2012-12-11 09:42:51 -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