Merge "Allow robustness tests on GLES 3.0" am: ab3013ef10 am: b23ee5b160 am: e801ea59...
authorKalle Raita <kraita@google.com>
Sun, 9 Apr 2017 18:00:56 +0000 (18:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 9 Apr 2017 18:00:56 +0000 (18:00 +0000)
am: 49b972090a

Change-Id: I113cf4172a072007c2af1345fe69d03c7049c04c


Trivial merge