Merge "Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA." into marshmal...
authorTina Zhou <tinazh@google.com>
Thu, 17 Nov 2016 17:24:42 +0000 (17:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 17 Nov 2016 17:24:42 +0000 (17:24 +0000)
am: effd4e62e5

Change-Id: Iee39c2459ce024cfcf90dda558b8712777fe2021


Trivial merge