Nick Kralevich 22641851c4 Merge "dumpstate: use correct header file."		2013-03-01 16:39:58 +00:00
build	Fix issue #7271589: Cannot set Ocean HD live wallpaper	2012-10-03 11:27:19 -07:00
cmds	dumpstate: use correct header file.	2013-02-28 16:46:22 -08:00
data/etc	Add android.hardware.camera.any feature to camera permissions.	2012-09-23 09:53:51 -07:00
include	am fdd8551f: Merge "Fix build"	2012-12-16 16:35:31 -08:00
libs	am 6426bd62: am f53f9c6d: [DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees	2012-12-10 17:58:33 -08:00
opengl	Simplify OpenGL TLS access on ARM.	2013-02-13 17:30:54 -08:00
services	am 845ed8fd: Merge "DisplayDevice: initialize mDisplayToken correctly"	2013-01-14 14:34:15 -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