OSDN Git Service

Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Tue, 29 Jun 2021 03:48:10 +0000 (11:48 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Tue, 29 Jun 2021 03:48:10 +0000 (11:48 +0800)
Conflicts:
nativebridge/bin/enable_nativebridge

1  2 
init.sh

diff --cc init.sh
Simple merge