Jesse Hall 1fd01cecf5 am 49385ec7: Merge "When disconnecting a surface, cancel don\'t queue the buffer" into jb-mr2-dev ... * commit '49385ec7c361347a69245c8a0838f6d03343a1de': When disconnecting a surface, cancel don't queue the buffer		2013-03-07 23:47:04 +00:00
build	Fix issue #7271589: Cannot set Ocean HD live wallpaper	2012-10-03 11:27:19 -07:00
cmds	am 22641851: Merge "dumpstate: use correct header file."	2013-03-01 18:05:56 +00:00
data/etc	Add android.hardware.camera.any feature to camera permissions.	2012-09-23 09:53:51 -07:00
include	Make GraphicBuffer a RefBase	2013-03-06 18:50:52 -08:00
libs	Fix RefBase debugging. O_CREAT must specify the mode.	2013-03-06 17:52:34 -08: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	workaround to fix screenshot leak on N4	2013-03-06 20:44:16 -08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00