tree e1420f9f8df927f4399de3e189e2654f6e62b038
parent e90d9bff07ef4e6545229780f4fb8f2e4b36da0e
parent 63feee914f4016de2cadf394e51e4bae41ed9a7c
author Krzysztof Kosiński <krzysio@google.com> 1523491202 -0700
committer android-build-merger <android-build-merger@google.com> 1523491202 -0700

Merge "Remove temporary hack from gl2ext.h header." into pi-dev am: f074747349
am: 63feee914f

Change-Id: I292f42d0fdccf21ff4e97ef73502fb5434f7f04c