The Android Open Source Project 8f3bc0c944 am c2e5b273: (-s ours) Reconcile with jb-mr1.1-release - do not merge ... * commit 'c2e5b273c43e3d1649c5f8cecb47c7d84afb6f6e':		2012-11-06 12:40:10 -08:00
build	Fix issue #7271589: Cannot set Ocean HD live wallpaper	2012-10-03 11:27:19 -07:00
cmds	dumpstate: dump all threads in show_wchan	2012-11-02 23:57:43 -07:00
data/etc	Add android.hardware.camera.any feature to camera permissions.	2012-09-23 09:53:51 -07:00
include	Change ConsumerBase's FrameAvailableListener to be a weak pointer	2012-11-05 13:39:02 -08:00
libs	Merge "Change ConsumerBase's FrameAvailableListener to be a weak pointer"	2012-11-05 13:47:37 -08:00
opengl	am f58475b5: am 60393d45: Merge "Add runtime debugging capabilities to OpenGL" into jb-mr1-dev	2012-10-18 17:39:13 -07:00
services	am 731e0331: am e70fbe8b: am 02b95105: fix transitions from hwc to GLES composition	2012-11-05 18:19:53 -08: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