am 48124f14: Remove some GLES3 multisample config cases am: 6d60ecb982 am: 74823aa0e4
authorKalle Raita <kraita@google.com>
Mon, 11 Jan 2016 19:47:43 +0000 (19:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:47:43 +0000 (19:47 +0000)
am: 1a7a0b517f

* commit '1a7a0b517f01e650211903f9904bf36973b23310':


Trivial merge