am 6566f6d2: am 54a10cdf: Merge "Fix GLES31 geo/tess linkage test uniforms with confi...
authorJarkko Pöyry <jpoyry@google.com>
Thu, 11 Jun 2015 17:19:34 +0000 (17:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 11 Jun 2015 17:19:34 +0000 (17:19 +0000)
* commit '6566f6d29e881d3db7e3431677b1712bc79d29ee':
  Fix GLES31 geo/tess linkage test uniforms with conficting precisions.


Trivial merge