The Android Open Source Project 2b556bc988 am 6d93da46: (-s ours) Reconcile with jb-mr1.1-release - do not merge ... * commit '6d93da465ab8fff02728f268785e59ab86a2a0c2':		2012-11-29 09:49:34 -08:00
build	Fix issue #7271589: Cannot set Ocean HD live wallpaper	2012-10-03 11:27:19 -07:00
cmds	Switch keystore to binder	2012-11-14 15:42:38 -08:00
data/etc	Add android.hardware.camera.any feature to camera permissions.	2012-09-23 09:53:51 -07:00
include	Add another ifndef and a couple of methods to LruCache	2012-11-28 17:37:03 -08:00
libs	Merge "SurfaceFlinger: refactor frame time tracking"	2012-11-20 12:20:52 -08:00
opengl	Merge "native_fence_sync: fix an enum name"	2012-11-26 14:12:12 -08:00
services	am a7da0dda: am 98cbec81: am efd614b8: Merge "make transform hint multi-display aware" into jb-mr1.1-dev	2012-11-27 18:43:52 -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