Merge "Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA." into marshmal...
authorTina Zhou <tinazh@google.com>
Wed, 23 Nov 2016 22:51:50 +0000 (22:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 23 Nov 2016 22:51:50 +0000 (22:51 +0000)
am: 5fa7a52fee

Change-Id: I98492712ad6820fde181fd8bd90086ee37886815


Trivial merge