Jesse Hall 647a92aa69 am df608eb1: am ce7e2781: Merge "Add Vector::resize()" into jb-mr2-dev ... * commit 'df608eb15d3b90d2e71e07baaa6de423c29769c8': Add Vector::resize()		2013-03-17 16:27:56 +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	Merge "Add Vector::resize()" into jb-mr2-dev	2013-03-16 03:23:13 +00:00
libs	am df608eb1: am ce7e2781: Merge "Add Vector::resize()" into jb-mr2-dev	2013-03-17 16:27:56 +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 allow screenshots without the READ_FRAMEBUFFER permission	2013-03-15 18:39:16 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00