Merge in changes from Khronos repository
authorPyry Haulos <phaulos@google.com>
Thu, 28 Jan 2016 01:33:42 +0000 (17:33 -0800)
committerPyry Haulos <phaulos@google.com>
Thu, 28 Jan 2016 01:33:42 +0000 (17:33 -0800)
commit58c95b16bd9e58411fb183f710805f9569059c96
tree06090e5ef9351435197435b479690189743f5794
parent34defd62b37d1f0d85ed1dea26c5e78f7b7abd0c
parentd5faa03d11da12f3ab9d6e8cb4ef098511f6c212
Merge in changes from Khronos repository