Merge "Fix const-correctness in texture filtering test cases"
authorCollin Baker <collinbaker@google.com>
Fri, 12 Aug 2016 21:32:48 +0000 (21:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Aug 2016 21:32:48 +0000 (21:32 +0000)
am: 201bdd03b9

Change-Id: I0d942132e887dfe5322b80d69cb47690711708d5


Trivial merge