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

Change-Id: I083154b3a8dcbfa07292266546fe3e7e0eb07dfb


Trivial merge