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

Change-Id: Ibc744ee5e1ef7192b8d689565376ec4a795caa16


Trivial merge