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

* commit '9829fdeabe03dba9bf24b5f229386849c34d8e49':


Trivial merge