Merge "Fix warnings in texture_filtering tests"
authorCollin Baker <collinbaker@google.com>
Tue, 2 Aug 2016 23:20:06 +0000 (23:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 2 Aug 2016 23:20:06 +0000 (23:20 +0000)
am: 083240d0d8

Change-Id: Iea7544af04d6defc6d670cf5d40c804e13e34b74


Trivial merge