OSDN Git Service

Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Tue, 10 Dec 2019 02:48:19 +0000 (10:48 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Tue, 10 Dec 2019 02:48:19 +0000 (10:48 +0800)
commit4831c618eb000d98cb283ef82db73d185c3a09ea
tree1101abd93aad824aaa6b7f9432c8318a33954027
parent716763cb9de32629e7b5968316828e6107577a9b
parent814774b3b38ffbbc23c09bf40f14df960ab4eb3a
Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86

Conflicts:
nativebridge/bin/enable_nativebridge
init.sh