Merge "Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA." into marshmal...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 18:54:15 +0000 (18:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:54:15 +0000 (18:54 +0000)
am: 74ef4ab285

Change-Id: I29e74330979d3b57f482b4f283c1467c59d5949f


Trivial merge