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 18:19:23 +0000 (18:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 17 Nov 2016 18:19:23 +0000 (18:19 +0000)
am: 5d63743a35

Change-Id: I29a81e1ef3d544371088cfd34c979f3acfa56ca7


Trivial merge