Mathias Agopian 7670d3cb2b Merge "get rid of purgatory and fix QueuesToWindowComposer query" into jb-mr2-dev		2013-03-16 01:14:35 +00:00
build	Fix issue #7271589: Cannot set Ocean HD live wallpaper	2012-10-03 11:27:19 -07:00
cmds	Increase screenshot timeout.	2013-03-14 10:20:31 -07: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 10:51:17 +00:00
libs	fix a couple race-conditions in RefBase::promote()	2013-03-14 16:47:41 -07: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	Merge "get rid of purgatory and fix QueuesToWindowComposer query" into jb-mr2-dev	2013-03-16 01:14:35 +00: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