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

* commit 'd0ec71e4fddcb92566e070c24fc61b18b65acbe7':


Trivial merge