Merge "Change MSAA sample-count error to warning" into marshmallow-cts-dev am: 0727d29796
authorDaniel Xie <dxie@google.com>
Thu, 3 Dec 2015 01:38:47 +0000 (01:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 3 Dec 2015 01:38:47 +0000 (01:38 +0000)
am: 0c59f7b7d6

* commit '0c59f7b7d672633e931af3538c59b5a982747997':
  Change MSAA sample-count error to warning


Trivial merge