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

Change-Id: Idb38336ee202b0b92cdeb708842de8f82383ba63


Trivial merge