Andrew Sutherland 1ccdbea036 Merge remote-tracking branch 'caf/jb' into jelly ...

Conflicts:
	common.mk
	libgralloc/alloc_controller.cpp
	libgralloc/pmem_bestfit_alloc.cpp
	libgralloc/pmemalloc.cpp
	libhwcomposer/hwc_external.cpp
	libqdutils/mdp_version.cpp

Change-Id: I1a0182faeb5e3c10153a5236434b55ff78b0eada

2012-08-02 23:02:46 -05:00

..

pipes

display: Clean up gralloc

2012-07-31 22:18:18 -06:00

Android.mk

overlay: Refactor State Transitions.

2012-07-27 08:24:19 -07:00

mdpWrapper.h

liboverlay: Remove waitForVsync, getOvPipeType APIs

2012-07-31 14:09:33 -07:00

overlay.cpp

liboverlay: Remove waitForVsync, getOvPipeType APIs

2012-07-31 14:09:33 -07:00

overlay.h

liboverlay: Remove waitForVsync, getOvPipeType APIs

2012-07-31 14:09:33 -07:00

overlayCtrl.cpp

liboverlay: Refactor, bug-fixes, upgrade.

2012-07-12 15:22:56 -07:00

overlayCtrlData.h

liboverlay: Remove waitForVsync, getOvPipeType APIs

2012-07-31 14:09:33 -07:00

overlayImpl.h

liboverlay: Remove waitForVsync, getOvPipeType APIs

2012-07-31 14:09:33 -07:00

overlayMdp.cpp

overlay: upgrade

2012-07-17 17:49:01 -07:00

overlayMdp.h

liboverlay: Remove waitForVsync, getOvPipeType APIs

2012-07-31 14:09:33 -07:00

overlayMem.h

display: Clean up gralloc

2012-07-31 22:18:18 -06:00

overlayRotator.cpp

overlay: Allow disabling secure playback

2012-07-29 23:35:28 -05:00

overlayRotator.h

overlay: upgrade

2012-07-17 17:49:01 -07:00

overlayState.h

hwc: Add support for external-only layers

2012-07-27 08:24:25 -07:00

overlayUtils.cpp

liboverlay: Update format translation.

2012-07-30 13:56:28 -07:00

overlayUtils.h

liboverlay: Remove waitForVsync, getOvPipeType APIs

2012-07-31 14:09:33 -07:00