Merge in changes from Khronos repository
authorPyry Haulos <phaulos@google.com>
Fri, 22 Jan 2016 01:46:23 +0000 (17:46 -0800)
committerPyry Haulos <phaulos@google.com>
Fri, 22 Jan 2016 01:46:23 +0000 (17:46 -0800)
commit6c814096b554af3bdbe372116d31c3a9faa82b9e
treee1c422c03ca21de99ae0fcf311aef056bf01e1e2
parent873c433bd07eef42ca7a44a5a8c942194a5d9b65
parent7d9bea78ecefc615eeb3ec22519063f994905f63
Merge in changes from Khronos repository