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

Change-Id: Id65f123aa247acbeb2d15651c63b6d0a71eff6eb


Trivial merge