tree 4c127154287a77524ad5b494deb8532a5f76a76c
parent 2671bb8d179ab69b2bf2c01e27ea0ed502eb9955
parent b0f9e3556696be2b6fc651cb91bdf7189626da30
author android-build-team Robot <android-build-team-robot@google.com> 1525118475 -0700
committer android-build-merger <android-build-merger@google.com> 1525118475 -0700

Merge "Work around CTS failure in eglCreateImageKHR." into pi-dev am: 6318d31dca
am: b0f9e35566

Change-Id: I0938f9c51f3c67bbbd83aa6f93c753947445c352