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)
am: 44f4cfc

* commit '44f4cfc50c2184791f7284714349fba26c120366':

Change-Id: I50c2a004880f15c6d6511f16bcab09834183a3b6


Trivial merge