Merge remote-tracking branch 'khronos/master' into HEAD
authorChris Forbes <chrisforbes@google.com>
Tue, 25 Sep 2018 19:47:20 +0000 (12:47 -0700)
committerChris Forbes <chrisforbes@google.com>
Tue, 25 Sep 2018 19:47:20 +0000 (12:47 -0700)
commitf5637d67a00a1081a13008bb8dc93b2616c935e2
treec112d8c281693ade83975b798e05b9033886f80c
parent3214da1026e9853a4bce1c64f840b026beb6aaa9
parent8b60ea6f02a2a04b335039b67c08b2795c5d77f4
Merge remote-tracking branch 'khronos/master' into HEAD

Change-Id: Icf5ec8a9a623f7264a973e87a0bb2f901097aa03