am e69df5c8: (-s ours) am 48124f14: Remove some GLES3 multisample config cases
authorKalle Raita <kraita@google.com>
Mon, 11 Jan 2016 19:47:50 +0000 (19:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:47:50 +0000 (19:47 +0000)
am: 216fb9f2df

* commit '216fb9f2dfc6fbf358c47e2cf133b0c36ad44362':


Trivial merge