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)
commitaa6d7b39180d5e0a2fd4f4ab4153db12a3394592
treebeba192e55af7378cc944e25d6f5e59370b5276b
parentba2499b2c4aa2695c1e1aef8b063ecc832619bbf
parent0c59f7b7d672633e931af3538c59b5a982747997
Merge "Change MSAA sample-count error to warning" into marshmallow-cts-dev am: 0727d29796
am: 0c59f7b7d6

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