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)
commit44f4cfc50c2184791f7284714349fba26c120366
treef3d314de1cd6287254560f1804ab5a268a27802f
parentf8fae30d191c125dc52a8f3810205b9f4b950a49
parentbd235c7ac6b07146ff175809083c12bdb53f8045
Merge "Merge "Use square cubemap textures in negative tests" into nyc-dev am: 491cdf1 am: 4e31fce" into nyc-mr1-dev-plus-aosp