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

Change-Id: Ie6b73cbf1c7b5b8ce3c43a1ed64cdd28b076dc98


Trivial merge