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

Change-Id: Ic553af3afa21d76387bc61f814d451d96f7b64cc


Trivial merge