Romain Guy 1ba2f61d75 am 49fe8add: am b96fe085: Merge "Add new debug option to force 4x MSAA in OpenGL ES 2.0 apps" into jb-mr1-dev ... * commit '49fe8addbfe52bf9a3e69e6250e462a70332235c': Add new debug option to force 4x MSAA in OpenGL ES 2.0 apps		2012-10-15 20:26:14 -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	Merge "Fence didn't manager sync_wait error codes properly" into jb-mr1-dev	2012-10-09 16:36:30 -07:00
libs	am 9bdaa60b: Merge "Add TEMP_FAILURE_RETRY around open and write calls" into jb-mr1-dev	2012-10-12 23:43:29 -07:00
opengl	am 49fe8add: am b96fe085: Merge "Add new debug option to force 4x MSAA in OpenGL ES 2.0 apps" into jb-mr1-dev	2012-10-15 20:26:14 -07:00
services	am c558269b: am 837d2f9e: Always set vertex alpha when drawing screenshot layers	2012-10-15 15:01:47 -07:00
MODULE_LICENSE_APACHE2	…
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00