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

Change-Id: I81d91f8d5bba7d136ed1e0709d7a8319d2c61b8e


Trivial merge