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

..

alloc_controller.cpp

display: Clean up gralloc

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

alloc_controller.h

display: Clean up gralloc

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

Android.mk

display: fixup ion ifdef again

2012-07-24 12:21:50 -05:00

fb_priv.h

framebuffer: Fix locking

2012-07-23 18:58:39 -05:00

framebuffer.cpp

framebuffer: Fix locking

2012-07-23 18:58:39 -05:00

gpu.cpp

display: Clean up gralloc

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

gpu.h

display: Clean up gralloc

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

gr.h

qcom/display: Update HALs

2012-07-10 02:03:45 -06:00

gralloc_priv.h

Merge remote-tracking branch 'caf/jb' into jelly

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

gralloc.cpp

display: Clean up gralloc

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

ionalloc.cpp

display: Clean up gralloc

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

ionalloc.h

gralloc: Fix msm_ion include

2012-07-12 17:24:05 -05:00

mapper.cpp

display: Clean up gralloc

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

memalloc.h

display: Clean up gralloc

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

MODULE_LICENSE_APACHE2

initial GL libraries for msm8960

2012-07-10 02:03:26 -06:00

NOTICE

initial GL libraries for msm8960

2012-07-10 02:03:26 -06:00