OSDN Git Service
(root)
/
android-x86
/
bootable-newinstaller.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1d57cfe
d68f8f8
)
Merge remote-tracking branch 'x86/oreo-x86' into pie-x86
android-x86-9.0-r2
author
Chih-Wei Huang
<cwhuang@linux.org.tw>
Fri, 13 Mar 2020 03:44:32 +0000
(11:44 +0800)
committer
Chih-Wei Huang
<cwhuang@linux.org.tw>
Fri, 13 Mar 2020 03:44:32 +0000
(11:44 +0800)
Conflicts:
Android.mk
1
2
initrd/init
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
initrd/init
Simple merge