Merge in changes from Khronos repository
authorPyry Haulos <phaulos@google.com>
Thu, 21 Jan 2016 17:50:23 +0000 (09:50 -0800)
committerPyry Haulos <phaulos@google.com>
Thu, 21 Jan 2016 17:50:23 +0000 (09:50 -0800)
commitbaef9d056753fbb87b6fceace9befc3d0db256af
tree3971a1b45baf38b12ae9d3b824e7cdb91b2af467
parent3a40c1645672ac36c31e4275b9b00ec3effa02c8
parent08f0e1dcd7afaac8e923d325391156d0dcb9fc06
Merge in changes from Khronos repository