From: Xin Li <delphij@google.com>
Date: Sat, 9 Jun 2018 08:54:13 +0000 (-0700)
Subject: Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
X-Git-Tag: upstream/1.3.5~1974^2~8^2~53
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fa5ee5486ff336552cd6f3c9dddb8cfba3c71f10;p=platform%2Fupstream%2FVK-GL-CTS.git

Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am: 5a8888e88d

Change-Id: I1e75407d431ed1a28ee5c94e478d57f0f86f1062
---

fa5ee5486ff336552cd6f3c9dddb8cfba3c71f10