Merge changes from Khronos repository
authorPyry Haulos <phaulos@google.com>
Wed, 30 Sep 2015 17:47:13 +0000 (10:47 -0700)
committerPyry Haulos <phaulos@google.com>
Wed, 30 Sep 2015 17:47:13 +0000 (10:47 -0700)
commit6eedc2ad932338cb99945f7bd26d91a8cf502914
treed612c63bc316c2d5fe1c4c96d0f435be8e3fa5a8
parent2437999ddde8af608c048eee1f23f034025647b7
parentf896d32db7d15d64cc98c6045ddd94201b007540
Merge changes from Khronos repository