Elliott Hughes d8151306f5 Merge "Revert "Add a compatibility symbol for the MemoryBase constructor.""		2013-03-14 02:56:48 +00:00
build	Fix issue #7271589: Cannot set Ocean HD live wallpaper	2012-10-03 11:27:19 -07:00
cmds	Ensure dumpstate children die	2013-03-11 11:44:15 -05:00
data/etc	Add android.hardware.camera.any feature to camera permissions.	2012-09-23 09:53:51 -07:00
include	Revert "Add a compatibility symbol for the MemoryBase constructor."	2013-03-14 02:56:34 +00:00
libs	Revert "Add a compatibility symbol for the MemoryBase constructor."	2013-03-14 02:56:34 +00: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