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

Change-Id: Ib346977b7862756224a9f8ff105990f800e408fc


Trivial merge