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:47:58 +0000 (18:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:47:58 +0000 (18:47 +0000)
am: a018587f17

Change-Id: I0de435189751a73f7a566c5ed1dc7f8d49c05936


Trivial merge