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

* commit '7027a5ac4ec69684a36c4bd4a5978f26fc355f03':


Trivial merge