Mathias Agopian ca987c8775 Merge "A few tweaks to RefBase debugging" into jb-mr2-dev		2013-03-19 23:00:40 +00:00
build	Fix issue #7271589: Cannot set Ocean HD live wallpaper	2012-10-03 11:27:19 -07:00
cmds	Merge "atrace: add support for tracing kernel functions" into jb-mr2-dev	2013-03-18 21:54:44 +00:00
data/etc	Add android.hardware.camera.any feature to camera permissions.	2012-09-23 09:53:51 -07:00
include	Merge changes I61ae54f3,I57cb668e,I7a3f1e1a,Id28a2f9b into jb-mr2-dev	2013-03-19 17:45:29 +00:00
libs	Merge "A few tweaks to RefBase debugging" into jb-mr2-dev	2013-03-19 23:00:40 +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	Don't log an error on HWC1.1+ devices with no FB HAL	2013-03-19 11:22:57 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00