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

Change-Id: I59d62fe066c60dafd9dfa33c3ab3b2564fe47017


Trivial merge