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

Change-Id: Ic3345e25752ac536ef6701bc8a89b8378dab5510


Trivial merge