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 18:03:22 +0000 (18:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 17 Nov 2016 18:03:22 +0000 (18:03 +0000)
am: 1a64a06d85

Change-Id: Ida82309b76f9022eaf113e005dce5425efb984e3


Trivial merge