Merge in changes from Khronos repository
authorPyry Haulos <phaulos@google.com>
Fri, 22 Jan 2016 21:43:39 +0000 (13:43 -0800)
committerPyry Haulos <phaulos@google.com>
Fri, 22 Jan 2016 21:43:39 +0000 (13:43 -0800)
commit42c7adf94ba456ee5e55f6b13118eb298f1b07e2
tree3e06b98114fc326f863ed1ac31234ab2931f0061
parent99a291878d319e67e68a4738782003c17be7a054
parentba583d1bd88d89bf7f8f0de4212232ce0a45ef09
Merge in changes from Khronos repository