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:32:56 +0000 (17:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 17 Nov 2016 17:32:56 +0000 (17:32 +0000)
am: 3dda7ae2d2

Change-Id: I99a63b7fe5fc3d5d9230cb4dd5fe3b5564224b50


Trivial merge