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

* commit 'aa6d7b39180d5e0a2fd4f4ab4153db12a3394592':


Trivial merge