Merge "Remove EGL gles1.rgb565_window from mustpass" am: 7bff163e7f am: 8d0d1e55f9...
authorPyry Haulos <phaulos@google.com>
Wed, 14 Jun 2017 02:10:34 +0000 (02:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 14 Jun 2017 02:10:34 +0000 (02:10 +0000)
am: d229e1047a

Change-Id: I3ebcf3db3045f35e2e8a69fd735d5f1798af51f2


Trivial merge