Merge "Allow robustness tests on GLES 3.0" am: ab3013ef10 am: b23ee5b160 am: e801ea5994
authorKalle Raita <kraita@google.com>
Tue, 22 Aug 2017 21:13:02 +0000 (21:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 21:13:02 +0000 (21:13 +0000)
am: ef62cc04d9

Change-Id: I055adce80842aafdd24a38866da1e1554e056485


Trivial merge