OSDN Git Service

resolve merge conflicts of 8a094116b to stage-aosp-master
authorIan Elliott <ianelliott@google.com>
Mon, 17 Jul 2017 21:05:03 +0000 (15:05 -0600)
committerIan Elliott <ianelliott@google.com>
Mon, 17 Jul 2017 21:05:03 +0000 (15:05 -0600)
commitbb7e1b68e6ce2ec44a716080bcf42bed87c8a90a
treec140accb3d3a45ae74367baa94358d7f0091d2b7
parent6a505f7ce1df18476d16e163e53a216e629f0259
parent8a094116b1a2b5478945116c1c5c07bba1810aa5
resolve merge conflicts of 8a094116b to stage-aosp-master

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I87e2955a7e44aa28eafacd44d404a23a1ae2e4a0
opengl/include/EGL/eglext.h