Merge in changes from Khronos repository
authorPyry Haulos <phaulos@google.com>
Tue, 15 Dec 2015 23:36:17 +0000 (15:36 -0800)
committerPyry Haulos <phaulos@google.com>
Tue, 15 Dec 2015 23:36:17 +0000 (15:36 -0800)
commit7bd1a8b63cc091309723ad7219eb599f8899fb01
tree7064844363ee0465ec941eb37e4af159d429b4f4
parentb47cc97529c5145b7fc067d8836b3597d387caaa
parent7252c0626fa3d8d6acdeaad6863bbd74fe84a6ba
Merge in changes from Khronos repository