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)
commit2d4ac81abd4b8257d1cd1ce9c817b53d13bc7070
treef3d314de1cd6287254560f1804ab5a268a27802f
parentdb7f41fe88505f22d06309d83d1e67dcf2ff1b02
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: I7315c9c71333acca4436194fa2df41ee6893c24e