Merge "Multiple draw buffers in blend_equation_advanced" am: 3e98e4c911 am: 3890f84766
authorMark Adams <marka@nvidia.com>
Wed, 25 Oct 2017 19:33:18 +0000 (19:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 25 Oct 2017 19:33:18 +0000 (19:33 +0000)
am: fc8fcfb67a

Change-Id: I5f83c3c0384515136e2877acbeab216940254edf


Trivial merge