Merge "Properly reset GL error state" into nyc-dev
authorMika Isojärvi <misojarvi@google.com>
Mon, 14 Mar 2016 19:46:02 +0000 (19:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 14 Mar 2016 19:46:02 +0000 (19:46 +0000)
am: 5eac1229aa

* commit '5eac1229aa242f6ab19bd8c2ca054d167b2fa96b':
  Properly reset GL error state


Trivial merge