Merge "Change MSAA sample-count error to warning" into marshmallow-cts-dev am: 0727d2...
authorDaniel Xie <dxie@google.com>
Mon, 11 Jan 2016 19:55:06 +0000 (19:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:55:06 +0000 (19:55 +0000)
am: 5c3d4f1a58

* commit '5c3d4f1a5825b5f69bc85cb4897d1b81d30c9869':


Trivial merge