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

Change-Id: I19606c2ea5318702348b73f6be056c85dfc3aaa8


Trivial merge