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:40:12 +0000 (17:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 17 Nov 2016 17:40:12 +0000 (17:40 +0000)
am: 5eed9806da

Change-Id: Ia1dffeb9012a2f878ed2719ea587f9bd36e1d660


Trivial merge