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

Change-Id: Iaaf165981b4fd3c1d62e006145cb83faf106bdf1


Trivial merge