Jeff Tinker e507d46e72 am 30041bd3: Merge "Updated MediaDrm API based on review input." into jb-mr2-dev ... * commit '30041bd3a487c3bfe45a5b802a0d3443cfcc0c51': Updated MediaDrm API based on review input.		2013-03-20 16:53:16 +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 "Updated MediaDrm API based on review input." into jb-mr2-dev	2013-03-20 16:47:34 +00:00
libs	disable RefBase consistency checks (NDEBUG)	2013-03-19 17:36:57 -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	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