From: Mika Isojärvi <misojarvi@google.com>
Date: Tue, 5 Sep 2017 18:15:08 +0000 (-0700)
Subject: resolve merge conflicts of 5b2571349 to oc-mr1-dev-plus-aosp
X-Git-Tag: upstream/1.3.5~1974^2~8^2~105^2~156^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=40ba3644f719c50e4ca50b38962255fe9d49b29c;p=platform%2Fupstream%2FVK-GL-CTS.git

resolve merge conflicts of 5b2571349 to oc-mr1-dev-plus-aosp

Test: Ran check_build_sanity.py.
Change-Id: I57546248a0851acf9bfdae0ce560e4a2006f2141
---

40ba3644f719c50e4ca50b38962255fe9d49b29c