The Android Open Source Project 83ae5807e2 am 9e7f65fd: (-s ours) Reconcile with jb-mr1-release - do not merge ... * commit '9e7f65fdc941f9e35faddc5d117bcb40aa91b09a':		2012-10-11 08:08:16 -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	Merge "gltrace: Do not start gltrace from early_egl_init."	2012-10-10 14:02:55 -07:00
services	am 9349b510: am f0c89b28: Merge "Fix HDMI unblank behavior" into jb-mr1-dev	2012-10-10 19:39:21 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00