Merge "Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA." into marshmal...
authorTina Zhou <tinazh@google.com>
Tue, 4 Apr 2017 19:01:09 +0000 (19:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 4 Apr 2017 19:01:09 +0000 (19:01 +0000)
am: bffab895c0

Change-Id: Ic2aa5f17252570924d4c249c124479e2729ee58c


Trivial merge