From: Marissa Wall <marissaw@google.com>
Date: Wed, 15 Mar 2017 00:50:33 +0000 (+0000)
Subject: Merge "test-hwc2: fix build errors on other branches"
X-Git-Tag: android-x86-8.1-r1~377^2^2~11
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=acfd2a846b;p=android-x86%2Fframeworks-native.git

Merge "test-hwc2: fix build errors on other branches"
am: ea8d46f1ab

Change-Id: I15fb43deec4eac3bb2867fa4dd101606cb593389
---

acfd2a846b54e9d630ed3d34cca9ad8cbd9f1f09