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 23:07:24 +0000 (23:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 23 Nov 2016 23:07:24 +0000 (23:07 +0000)
am: efcf4f78ee

Change-Id: Iaafb001d896737b983c381085be008548184d973


Trivial merge