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

Change-Id: I9a7fffe577492ca96cad5ba39ff975839513cfb7


Trivial merge