Merge "Add triangle edge guardband for Tex2D lookup diff" am: da231f19ab am: e609b77e0b
authorKalle Raita <kraita@google.com>
Thu, 20 Jul 2017 19:53:12 +0000 (19:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 20 Jul 2017 19:53:12 +0000 (19:53 +0000)
am: 4cc6a34527

Change-Id: Ice5ca10df6f5063067f69580559eacef5f2c530b


Trivial merge