Merge remote-tracking branch 'x86/oreo-x86' into pie-x86

author Chih-Wei Huang <cwhuang@linux.org.tw>

Wed, 15 Jul 2020 17:32:02 +0000 (01:32 +0800)

committer Chih-Wei Huang <cwhuang@linux.org.tw>

Wed, 15 Jul 2020 17:32:02 +0000 (01:32 +0800)
author Chih-Wei Huang <cwhuang@linux.org.tw>
Wed, 15 Jul 2020 17:32:02 +0000 (01:32 +0800)
committer Chih-Wei Huang <cwhuang@linux.org.tw>
Wed, 15 Jul 2020 17:32:02 +0000 (01:32 +0800)
diff --cc init.sh
Simple merge
diff --cc nativebridge/bin/enable_nativebridge
Simple merge
author	Chih-Wei Huang <cwhuang@linux.org.tw>
	Wed, 15 Jul 2020 17:32:02 +0000 (01:32 +0800)
committer	Chih-Wei Huang <cwhuang@linux.org.tw>
	Wed, 15 Jul 2020 17:32:02 +0000 (01:32 +0800)
		1	2
init.sh	patch \|	diff1 \|	diff2 \|	blob \| history
nativebridge/bin/enable_nativebridge	patch \|	diff1 \|	diff2 \|	blob \| history