Nick Kralevich ec87d2e912 am 5ec3e781: Merge "installd: use correct header file." into jb-mr2-dev ... * commit '5ec3e781c540d660a921a48575e241ae6839a26f': installd: use correct header file.		2013-03-01 17:49:47 +00:00
build	Fix issue #7271589: Cannot set Ocean HD live wallpaper	2012-10-03 11:27:19 -07:00
cmds	installd: use correct header file.	2013-02-28 16:59:13 -08:00
data/etc	Add android.hardware.camera.any feature to camera permissions.	2012-09-23 09:53:51 -07:00
include	CpuConsumer: Add optional asynchronous mode	2013-02-28 15:51:24 -08:00
libs	CpuConsumer: Add optional asynchronous mode	2013-02-28 15:51:24 -08:00
opengl	add some missing parameter validation in GLES java bindings	2013-02-25 16:50:51 -08:00
services	Initialize DisplayData fences to NO_FENCE, not NULL	2013-02-27 16:48:41 -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