OSDN Git Service

Merge remote-tracking branch 'x86/oreo-x86' into pie-x86 android-x86-9.0-r2
authorChih-Wei Huang <cwhuang@linux.org.tw>
Fri, 13 Mar 2020 03:44:32 +0000 (11:44 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Fri, 13 Mar 2020 03:44:32 +0000 (11:44 +0800)
 Conflicts:
Android.mk

1  2 
initrd/init

diff --cc initrd/init
Simple merge