Merge changes from Khronos repository
authorPyry Haulos <phaulos@google.com>
Mon, 23 Nov 2015 23:23:52 +0000 (15:23 -0800)
committerPyry Haulos <phaulos@google.com>
Mon, 23 Nov 2015 23:23:52 +0000 (15:23 -0800)
commit7f940ed31ad8005ed6834cba72436f969cf5ef4f
tree7c6bc834ec85176d423b51bcf5ce97e9128df9a1
parent7617e1896b93e92cce0214dfbdcd864b8cfbe144
parentdd949913166b91c2cc2653dbce571f8b19850b1d
Merge changes from Khronos repository