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

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

1  2 
modules/gles3/functional/es3fMultisampleTests.cpp