Go to file
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
libcopybit Merge remote-tracking branch 'caf/jb' into jelly 2012-08-02 23:02:46 -05:00
libgenlock display: Clean up makefiles 2012-07-13 06:18:40 -07:00
libgralloc Merge remote-tracking branch 'caf/jb' into jelly 2012-08-02 23:02:46 -05:00
libhwcomposer Merge remote-tracking branch 'caf/jb' into jelly 2012-08-02 23:02:46 -05:00
liblight display: Add lights HAL 2012-07-10 01:42:45 -07:00
liboverlay Merge remote-tracking branch 'caf/jb' into jelly 2012-08-02 23:02:46 -05:00
libqdutils display: Clean up gralloc 2012-07-31 22:18:18 -06:00
libtilerenderer display: Clean up makefiles 2012-07-13 06:18:40 -07:00
Android.mk qcom/display: edit makefile for our tree 2012-07-13 03:09:18 -05:00
common.mk display: Clean up gralloc 2012-07-31 22:18:18 -06:00