Merge in fixes from Khronos repository
authorPyry Haulos <phaulos@google.com>
Wed, 13 Apr 2016 22:19:22 +0000 (15:19 -0700)
committerPyry Haulos <phaulos@google.com>
Wed, 13 Apr 2016 22:19:22 +0000 (15:19 -0700)
commitd56e5ef627f6f2b32c95e2a8236d79405dcf94c9
tree517e61130afc042d40951167d01f22f5cd39313c
parent3968146ba8b8e569e20b5ea35ac157a63ec2c476
parent8630bf819dc285c186dee708bbf68f629ca60617
Merge in fixes from Khronos repository