Merge in changes from Khronos repository
authorPyry Haulos <phaulos@google.com>
Wed, 9 Dec 2015 20:51:12 +0000 (12:51 -0800)
committerPyry Haulos <phaulos@google.com>
Wed, 9 Dec 2015 20:51:12 +0000 (12:51 -0800)
commit100553c44d628787b680ef2931d56074c02a9489
treed648388fd5337724ce372ac4f40ad5b312a01388
parent6719b46a267894c6c09a7945c0fb5f644977bdcb
parentcd4e0a90127a04e14045b1e8101490f734b5c4d8
Merge in changes from Khronos repository