Steve Kondik d2dde1230a Merge branch 'ics' of https://github.com/toastcfh/android_hardware_qcom_display into HEAD ...

Conflicts:
	libhwcomposer/Android.mk

Change-Id: I22baeb33395aa3478554109781dd1ded2293490b

2011-12-30 09:25:44 -08:00

..

Android.mk

Merge branch 'ics' of https://github.com/toastcfh/android_hardware_qcom_display into HEAD

2011-12-30 09:25:44 -08:00

hwcomposer.cpp

Display: Use bitwise operators on HWC flags

2011-12-26 16:46:14 -05:00