Merge changes Iee2918c1,I3a98fe12 into oc-mr1-dev
authorMika Isojarvi <misojarvi@google.com>
Wed, 6 Sep 2017 16:32:19 +0000 (16:32 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 6 Sep 2017 16:32:19 +0000 (16:32 +0000)
commit77827f42127638d664c9f96a2851e4401473d28a
tree2c904a0a64d821885a3bc79380c78fffd6e25da8
parent5b2571349bffd20ae44025e59d4e79c823278979
parent594790a1aa0ff3c5a4d2f27570f4a03617753f29
Merge changes Iee2918c1,I3a98fe12 into oc-mr1-dev

* changes:
  Fix unused uniform bug in EGL robustness tests
  Fix missing SSBO binding in EGL robustness tests