Merge "Fix const-correctness in texture filtering test cases" am: 201bdd03b9 am:...
authorCollin Baker <collinbaker@google.com>
Tue, 22 Aug 2017 17:40:59 +0000 (17:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 17:40:59 +0000 (17:40 +0000)
am: 67ccf173ed

Change-Id: I6842dfdd5ab404611cb282622154afa348481bce


Trivial merge