The Android Open Source Project 7fbe8e12da am 31e84850: (-s ours) Reconcile with jb-mr1.1-release - do not merge ... * commit '31e8485028e93c16312c57b5bb6b511e3bc8582d': workaround: don't reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE]		2012-11-28 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	SurfaceFlinger: refactor frame time tracking	2012-11-19 17:45:09 -08:00
libs	Merge "SurfaceFlinger: refactor frame time tracking"	2012-11-20 12:20:52 -08:00
opengl	am a90173d8: am 762a6d86: Merge "DO NOT MERGE - native_fence_sync: fix an enum name" into jb-mr1.1-dev	2012-11-27 11:39:20 -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
NOTICE