The Android Open Source Project c5a70b1d24 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge ... Change-Id: I38012327dc2f36e7e2a6773a2e1dfc49be6475ad		2012-10-12 07:31:01 -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 8d5d2019: Revert "Add GL Error logs (temporary)"	2012-10-10 13:21:39 -07:00
services	Assume LayerScreenshot has pre-multiplied alpha	2012-10-10 21:40:26 -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