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

Change-Id: I459f4ec76e9cab982bf299a5fe9987517ea2ec85


Trivial merge