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:17:43 +0000 (17:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 17 Nov 2016 17:17:43 +0000 (17:17 +0000)
commit3dda7ae2d29f9d32927210f1547eb0ab6f6586c9
tree129fcddfc5279bd83b6d92b65c09b43008fc7de3
parentd1311396295baa6e7840eae59fa38cdd064060e9
parentc2c27aa5628830e35a28c3ee5c26e1d20ccd17ed
Merge "Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA." into marshmallow-cts-dev am: a5af1b076f
am: c2c27aa562

Change-Id: I92de6f7a0cd6b064f8d0391fac2f70b464acd8d4