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

Change-Id: I890cf44e96256d293df7953d55708ed7e1e4e24b


Trivial merge