Merge in changes from Khronos repository
authorPyry Haulos <phaulos@google.com>
Fri, 22 Jan 2016 20:44:05 +0000 (12:44 -0800)
committerPyry Haulos <phaulos@google.com>
Fri, 22 Jan 2016 20:44:05 +0000 (12:44 -0800)
commit70da0bc1a26684a750e8529c95e16578a5338820
tree9fb8bdbf5a4cb6bd0d86e22e96996bc797f9b19d
parentd994401d7875a0897fac81fd32c41eb13a01fbdf
parentae1afcc6b8bd6533e3f1c6d0028e04eb2963f5bb
Merge in changes from Khronos repository