Merge "drm_hwcomposer: Wrap libdrm ops (minus modeset/flip) in C++ classes" into...

author Sean Paul <seanpaul@google.com>

Mon, 11 May 2015 17:34:17 +0000 (17:34 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Mon, 11 May 2015 17:34:17 +0000 (17:34 +0000)
author Sean Paul <seanpaul@google.com>
Mon, 11 May 2015 17:34:17 +0000 (17:34 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 11 May 2015 17:34:17 +0000 (17:34 +0000)
diff --cc Android.mk
Simple merge
diff --cc hwcomposer.cpp
Simple merge
author	Sean Paul <seanpaul@google.com>
	Mon, 11 May 2015 17:34:17 +0000 (17:34 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 11 May 2015 17:34:17 +0000 (17:34 +0000)
		1	2
Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history
hwcomposer.cpp	patch \|	diff1 \|	diff2 \|	blob \| history