The Android Automerger 2de86a4e1b merge in jb-mr1-factory-release history after reset to jb-mr1-dev		2012-10-10 08:55:31 -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	Merge "Fence didn't manager sync_wait error codes properly" into jb-mr1-dev	2012-10-09 16:36:30 -07:00
opengl	Add GL Error logs (temporary)	2012-10-04 17:15:59 -07:00
services	Merge "fix typo that prevented proper loging of EGL error code" into jb-mr1-dev	2012-10-09 16:52:37 -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