Merge "Merge "Use square cubemap textures in negative tests" into nyc-dev am: 491cdf1...
authorTreeHugger Robot <treehugger-gerrit@google.com>
Tue, 19 Apr 2016 21:38:53 +0000 (21:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 19 Apr 2016 21:38:53 +0000 (21:38 +0000)
commite327de573b22c146891f1b27056e5363979428b3
treebf7e2b1ec94e68590df2f0e54051c6d49b394894
parent6957a5528fd03118852e9fa5fe85fc34de8c9fe8
parent44f4cfc50c2184791f7284714349fba26c120366
Merge "Merge "Use square cubemap textures in negative tests" into nyc-dev am: 491cdf1 am: 4e31fce" into nyc-mr1-dev-plus-aosp
am: 44f4cfc

* commit '44f4cfc50c2184791f7284714349fba26c120366':

Change-Id: I50c2a004880f15c6d6511f16bcab09834183a3b6