tree 28a0e6a36d0a5cd6cd5df3d1b6d4c973440ad510
parent 72265c726247de3ee0bb7e9c90db1dfc2527765c
parent 0d376a1da9b307c4cac6f0eb4dde87599b3393d5
author Ian Elliott <ianelliott@google.com> 1532988127 -0700
committer android-build-merger <android-build-merger@google.com> 1532988127 -0700

Merge "Remove a no-longer-needed workaround from eglMakeCurrent" into pi-dev-plus-aosp
am: 0d376a1da9

Change-Id: I7822cfac1bb647072e808d4b0b7fe412d8fed031