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:52:31 +0000 (22:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 23 Nov 2016 22:52:31 +0000 (22:52 +0000)
am: 1094f351d1

Change-Id: Ifd7cc5ea44a565ae0372251d001df27cf8a08420


Trivial merge