Merge "Use square cubemap textures in negative tests" into nyc-dev
authorMika Isojärvi <misojarvi@google.com>
Tue, 19 Apr 2016 21:32:19 +0000 (21:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 19 Apr 2016 21:32:19 +0000 (21:32 +0000)
commit4e31fcef14f592e7efd727bdd79f9e65a30ffd5d
treee49e61bd94f08422a2ac0b18e0511c12d9bff8e8
parentda88514624f02255f81d3ea5561db349959227ff
parent491cdf1333964f403b701dcd02140b6fbb2f85a6
Merge "Use square cubemap textures in negative tests" into nyc-dev
am: 491cdf1

* commit '491cdf1333964f403b701dcd02140b6fbb2f85a6':
  Use square cubemap textures in negative tests

Change-Id: I9aa3897f0824834997c1356855d1b33eb8ff178f