Eino-Ville Talvala aaebffd52f Merge "CpuConsumer: Properly track acquired buffers" into jb-mr2-dev		2013-03-21 16:39:14 +00:00
build	Fix issue #7271589: Cannot set Ocean HD live wallpaper	2012-10-03 11:27:19 -07:00
cmds	Merge "Move screenshots near beginning of dumpstate." into jb-mr2-dev	2013-03-20 19:09:45 +00:00
data/etc	Add android.hardware.camera.any feature to camera permissions.	2012-09-23 09:53:51 -07:00
include	Merge "CpuConsumer: Properly track acquired buffers" into jb-mr2-dev	2013-03-21 16:39:14 +00:00
libs	Merge "CpuConsumer: Properly track acquired buffers" into jb-mr2-dev	2013-03-21 16:39:14 +00:00
opengl	Merge "When disconnecting a surface, cancel don't queue the buffer" into jb-mr2-dev	2013-03-07 23:43:56 +00:00
services	rework how we take screenshots for a CPU consumer	2013-03-19 22:22:21 -07: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