Merge "Fix failing assertion if glGetIntegerv query fails."
authorJarkko Pöyry <jpoyry@google.com>
Mon, 23 Mar 2015 17:55:06 +0000 (17:55 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 23 Mar 2015 17:55:07 +0000 (17:55 +0000)

Trivial merge