OSDN Git Service

(root) / android-x86 / external-minigbm.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d284a64 21d6fa9)
resolve merge conflicts of 42ca6159e52c5a2217825da02a26cf504998301b to stage-aosp...
authorJason Macnak <natsu@google.com>
Thu, 29 Oct 2020 22:37:47 +0000 (15:37 -0700)
committerJason Macnak <natsu@google.com>
Thu, 29 Oct 2020 22:37:47 +0000 (15:37 -0700)
... by making stage-aosp-master contents match goog/mirror-aosp-master
exactly.

Change-Id: I11be47e51b5e12562384b5870d5442cee1f12be8


Trivial merge
external/minigbm
About OSDN
Find Software
Develop Software
Help