Jamie Gennis 7ee4aba226 am 3b6055a7: am ba7dc2db: Merge "SurfaceFlinger: add support for secure displays" into jb-mr1-dev ... * commit '3b6055a7184a2da7bbdd94118a8c6af875bb28b1': SurfaceFlinger: add support for secure displays		2012-10-22 13:57:51 -07:00
build	Fix issue #7271589: Cannot set Ocean HD live wallpaper	2012-10-03 11:27:19 -07:00
cmds	Include Global table in bugreports.	2012-10-01 12:52:42 -07:00
data/etc	Add android.hardware.camera.any feature to camera permissions.	2012-09-23 09:53:51 -07:00
include	am ba7dc2db: Merge "SurfaceFlinger: add support for secure displays" into jb-mr1-dev	2012-10-22 13:54:50 -07:00
libs	am ba7dc2db: Merge "SurfaceFlinger: add support for secure displays" into jb-mr1-dev	2012-10-22 13:54:50 -07:00
opengl	am f58475b5: am 60393d45: Merge "Add runtime debugging capabilities to OpenGL" into jb-mr1-dev	2012-10-18 17:39:13 -07:00
services	am 3b6055a7: am ba7dc2db: Merge "SurfaceFlinger: add support for secure displays" into jb-mr1-dev	2012-10-22 13:57:51 -07: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