Merge in changes from Khronos repository
authorPyry Haulos <phaulos@google.com>
Thu, 14 Jan 2016 23:15:19 +0000 (15:15 -0800)
committerPyry Haulos <phaulos@google.com>
Thu, 14 Jan 2016 23:15:19 +0000 (15:15 -0800)
commit08f9e77cbfced9ae6178071b933536a5aab8f78d
tree133c0a7ad89988106cec02eeee3d54543314d642
parent205a838fe1dc21a526960d61195c829aa0802da2
parent29c9d5defb7d6985d79667158098ca496222b754
Merge in changes from Khronos repository