Merge "Remove EGL gles1.rgb565_window from mustpass" into oc-dev
authorPyry Haulos <phaulos@google.com>
Tue, 13 Jun 2017 23:37:58 +0000 (23:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Jun 2017 23:37:58 +0000 (23:37 +0000)
am: 840e33e440

Change-Id: Icafa3054e8f06d3c5f7fdab947a2c9402ac3e5dc


Trivial merge