The Android Open Source Project dc9c3a4f2b Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge ... Change-Id: I9b2354f718f8e792bd040b7fb92f8fd1c77c037a		2012-10-10 09:44:41 -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 45778999: Merge "Fence didn\'t manager sync_wait error codes properly" into jb-mr1-dev	2012-10-09 16:40:08 -07:00
opengl	am 27b28fd9: Merge "Add GL Error logs (temporary)" into jb-mr1-dev	2012-10-04 19:48:12 -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
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00