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)
commit1b5b849a135edf8d214309dafc48902a7f103dac
treee62e4905ec1604b74580564fef3ce161cd7e1944
parentb4dc2326872cfab87f75c4dc47032904816d72a5
parenta7654e4aa78121befb164b4bb0b59195fe9f0611
Merge "Fix const-correctness in texture filtering test cases" am: 201bdd03b9
am: a7654e4aa7

Change-Id: Ib346977b7862756224a9f8ff105990f800e408fc