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)
* changes:
  Fix unused uniform bug in EGL robustness tests
  Fix missing SSBO binding in EGL robustness tests


Trivial merge