Merge changes from Khronos repository
authorPyry Haulos <phaulos@google.com>
Sat, 12 Dec 2015 00:20:18 +0000 (16:20 -0800)
committerPyry Haulos <phaulos@google.com>
Sat, 12 Dec 2015 00:20:18 +0000 (16:20 -0800)
commit04807d33d8be45a716fd58280cd2209fa1d4e42e
tree2c2ef48b843309135c5a61838c093bc5813df6e3
parent2578e7ae340e5748cc33041244506075ccbbd7c1
parent392026aca29785d600eeb466520816c3cb86e9bb
Merge changes from Khronos repository