Merge "Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA." into marshmal...
authorTina Zhou <tinazh@google.com>
Tue, 4 Apr 2017 18:56:42 +0000 (18:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 4 Apr 2017 18:56:42 +0000 (18:56 +0000)
am: 6b756fb6c2

Change-Id: I3917a177d172091bd26153d8cd3b23aa4a60dda8


Trivial merge