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

Change-Id: I0eaa10c819e4f424a9afba9a1efef9c6d8db8497


Trivial merge