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

Change-Id: I52eeb782dfcee1b895c29d3ea774d3cd3428d04f


Trivial merge