Merge changes Id7b52bba,I13b7d016 into nyc-dev
authorMika Isojarvi <misojarvi@google.com>
Fri, 11 Mar 2016 01:06:22 +0000 (01:06 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 11 Mar 2016 01:06:22 +0000 (01:06 +0000)
* changes:
  Check that glReadnPixels() is supported in negative tests
  Add robustness extensions to GL wrappers


Trivial merge