From: Kenneth Benzie <k.benzie@codeplay.com>
Date: Wed, 2 Sep 2015 09:49:42 +0000 (-0400)
Subject: Merge branch 'google-catch-up' into 'master'
X-Git-Tag: upstream/2018.6~1512
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=31e482cdf5587b37a2bbae8b464ca260fd38e0d3;p=platform%2Fupstream%2FSPIRV-Tools.git

Merge branch 'google-catch-up' into 'master'

Google changes during GitLab outage

These are the changes made by Google during the GitLab outage last week.

See merge request !9
---

31e482cdf5587b37a2bbae8b464ca260fd38e0d3