Merge changes Id7b52bba,I13b7d016 into nyc-dev
authorMika Isojärvi <misojarvi@google.com>
Fri, 11 Mar 2016 01:14:57 +0000 (01:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 11 Mar 2016 01:14:57 +0000 (01:14 +0000)
am: 5d925cba3a

* commit '5d925cba3a8826472110e287e0b160e539e017c0':
  Check that glReadnPixels() is supported in negative tests
  Add robustness extensions to GL wrappers


Trivial merge