Merge "Use square cubemap textures in negative tests" into nyc-dev am: 491cdf1 am...
authorMika Isojärvi <misojarvi@google.com>
Tue, 19 Apr 2016 21:38:52 +0000 (21:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 19 Apr 2016 21:38:52 +0000 (21:38 +0000)
commit6957a5528fd03118852e9fa5fe85fc34de8c9fe8
treebf7e2b1ec94e68590df2f0e54051c6d49b394894
parente86f3bbf4620fd330caa8b3552d388504fa0ac77
parentf8fae30d191c125dc52a8f3810205b9f4b950a49
Merge "Use square cubemap textures in negative tests" into nyc-dev am: 491cdf1 am: 2d4ac81
am: f8fae30

* commit 'f8fae30d191c125dc52a8f3810205b9f4b950a49':
  Use square cubemap textures in negative tests

Change-Id: I898be76fec6a16afd8be5733294ec531026ace06