OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6a505f7 8a09411)
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)
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I87e2955a7e44aa28eafacd44d404a23a1ae2e4a0

1  2 
opengl/include/EGL/eglext.h patch | diff1 | diff2 | blob | history

diff --cc opengl/include/EGL/eglext.h
Simple merge
frameworks/native
About OSDN
Find Software
Develop Software
Help