Merge "CP: Add triangle edge guardband for Tex2D lookup diff am: e345d7b6ba am: 138ad...
authorKalle Raita <kraita@google.com>
Mon, 31 Jul 2017 23:25:58 +0000 (23:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 31 Jul 2017 23:25:58 +0000 (23:25 +0000)
am: 75ee1ba172

Change-Id: I456ead89f40fc42df4f444daca1b7c8b053b9927


Trivial merge