Merge Khronos repository
authorPyry Haulos <phaulos@google.com>
Thu, 17 Dec 2015 23:01:34 +0000 (15:01 -0800)
committerPyry Haulos <phaulos@google.com>
Thu, 17 Dec 2015 23:01:34 +0000 (15:01 -0800)
commitaff4dc13e83d7dec8c1dc0b835753098678802f2
treeccfd3c1009f52a06d984a007937c057aa0f569d0
parent15c7885f6371bbea23dfd055741be54cd2bf1369
parenta39b8ef211bb58e86d9e5f4dc22c46383805d8cf
Merge Khronos repository