Merge in changes from Khronos repository
authorPyry Haulos <phaulos@google.com>
Wed, 16 Dec 2015 18:44:35 +0000 (10:44 -0800)
committerPyry Haulos <phaulos@google.com>
Wed, 16 Dec 2015 18:44:35 +0000 (10:44 -0800)
commita4e35f53906b86f68a6d3bdf3253a57ca6d0d0da
tree0bc4f19cdb99a7bbad0a8d7fcaf8be789f04f8fe
parentd2774ca04327bc2fdf5be81cabbfbd9fe474b305
parent2df7d9d2cfc8dfbb7c5466153d3f76e99d6e956f
Merge in changes from Khronos repository