OSDN Git Service

Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Wed, 15 Jul 2020 17:30:37 +0000 (01:30 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Wed, 15 Jul 2020 17:30:37 +0000 (01:30 +0800)
commit522f707b8ea183de74660fcf888491a7fd91c68c
treefe683fa6f1dbac0edd0bf685e069db845cba531d
parent64c7fc269654fda78959e44d21baf73d7cf249c6
parentd6b109f364b89f9458971fcb0ed64b3b932de30b
Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86

Conflicts:
nativebridge/bin/enable_nativebridge
init.sh
nativebridge/bin/enable_nativebridge