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

Change-Id: Ic43c71428428209a8f6ef1455a8bc7991d888514


Trivial merge