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

* commit '0727d29796e35bbeb403cac3939ddedc5cd877f5':
  Change MSAA sample-count error to warning


Trivial merge