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

Change-Id: Ie641e0ea18122ac0d6f640249d54dd41e7867825


Trivial merge