Merge in changes from Khronos repository
authorPyry Haulos <phaulos@google.com>
Fri, 22 Jan 2016 22:48:56 +0000 (14:48 -0800)
committerPyry Haulos <phaulos@google.com>
Fri, 22 Jan 2016 22:48:56 +0000 (14:48 -0800)
commit870cfff946238a77d9183fc8e7153e931a8b7fd2
treeb06c378d806446d5913237d2ea29fc8dd94f5cd1
parent2069555720c504fb1059a15816fad78eff5e9638
parent3d519f37eb68212e3f2902dfd45a20fab91e61da
Merge in changes from Khronos repository