Merge in changes from Khronos repository
authorPyry Haulos <phaulos@google.com>
Thu, 17 Dec 2015 22:09:13 +0000 (14:09 -0800)
committerPyry Haulos <phaulos@google.com>
Thu, 17 Dec 2015 22:09:13 +0000 (14:09 -0800)
commite33ebabf6e5bd0912ed9d82f8839e433dffcf493
tree52cea9d3dab33d7df9eacaf2f7ce73ec44e28bcd
parentc96df73a804cbc91f37d06bcfb13b0e213450974
parent15542d007554d4734b5efd149e57ca78d38a3f06
Merge in changes from Khronos repository