OSDN Git Service

Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Fri, 11 Jan 2019 17:05:27 +0000 (01:05 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Fri, 11 Jan 2019 17:05:27 +0000 (01:05 +0800)
commitad0955fe563f2eca9d2267df09328ba1686bcf65
tree310f45dc0b5bc471f53d514b07a073a463a18cb1
parentce5cee7010dc6191fc898e610180d7198ddf729d
parentf32965a0f3f1fb09949eed01a3615d95f0e674dd
Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86

Conflicts:
install/scripts/1-install
Android.mk
install/grub2/efi/boot/android.cfg
install/scripts/1-install