Merge "Allow robustness tests on GLES 3.0"
authorKalle Raita <kraita@google.com>
Fri, 7 Apr 2017 19:50:05 +0000 (19:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 7 Apr 2017 19:50:05 +0000 (19:50 +0000)
am: ab3013ef10

Change-Id: If6497fda1e89609581607770ec60ac6b0d13c2fd


Trivial merge