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

Change-Id: Ie4572cea5032ace438efdd10788238296c842f1d


Trivial merge