Merge in changes from Khronos repository
authorPyry Haulos <phaulos@google.com>
Wed, 25 Nov 2015 23:41:10 +0000 (15:41 -0800)
committerPyry Haulos <phaulos@google.com>
Wed, 25 Nov 2015 23:41:10 +0000 (15:41 -0800)
commit269b09df8728cb66c8dd980fae8e3129081f0add
tree436b41cb3e14fd86234ccdec7c52bfa09e137e8e
parentb10f41aed29c5cb350ef7091ff3cfa165426e9ba
parent3f8ea0ecf37caa45a0b8d8b7a12d41f1f6ea3eb7
Merge in changes from Khronos repository