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

Change-Id: If8bb8615862e2066b848b5bfb95718edaf8cd275


Trivial merge