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

Change-Id: I71238b61406e5d6b58d3ca02310704c19ffa58b5


Trivial merge