Merge in fixes from Khronos repository
authorPyry Haulos <phaulos@google.com>
Mon, 14 Dec 2015 23:14:51 +0000 (15:14 -0800)
committerPyry Haulos <phaulos@google.com>
Mon, 14 Dec 2015 23:14:51 +0000 (15:14 -0800)
commit28ded5eb21d208f360311950a0a2252e168b5065
treed152db4a0bf221e2a108039c42247c5af58086c1
parent806b318323a49b4410f76fc7fa1b86fcb30135d1
parentfcdabf7e03d6b1bcd11d4b86a5ee1f1ba547e493
Merge in fixes from Khronos repository