Merge "Add triangle edge guardband for Tex2D lookup diff" am: da231f19ab am: e609b77e...
authorKalle Raita <kraita@google.com>
Thu, 20 Jul 2017 19:58:46 +0000 (19:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 20 Jul 2017 19:58:46 +0000 (19:58 +0000)
am: 93d77ca824

Change-Id: I36c904f999a822186440187ba15f460eb9c874f6


Trivial merge