Merge "Merge "Use square cubemap textures in negative tests" into nyc-dev am: 491cdf1...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Tue, 19 Apr 2016 21:35:39 +0000 (21:35 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 19 Apr 2016 21:35:39 +0000 (21:35 +0000)

Trivial merge