Merge in changes from Khronos repository
authorPyry Haulos <phaulos@google.com>
Tue, 10 Nov 2015 16:58:49 +0000 (08:58 -0800)
committerPyry Haulos <phaulos@google.com>
Tue, 10 Nov 2015 16:58:49 +0000 (08:58 -0800)
commit581e3bf3b36cca7f5a766e0dcfb845e6f0559775
tree26fa8eeaf4579e8964c699cce7eb6a7c3c52cb19
parent80015096039d9336eb3f80cd9ae8eb3de5264d24
parent62fa9adecf80440d7667e672fdd0b713d03b6c9a
Merge in changes from Khronos repository