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

Change-Id: I4154c0c8a1a25f6eafda6a8b6c7e89859a272021


Trivial merge