Merge "Fix warnings in texture_filtering tests"
authorTreehugger Robot <treehugger-gerrit@google.com>
Tue, 2 Aug 2016 23:16:45 +0000 (23:16 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 2 Aug 2016 23:16:46 +0000 (23:16 +0000)

Trivial merge