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

Change-Id: Ie579618f0c936d201a57ed72470f556cd161f278


Trivial merge