OSDN Git Service

Merge remote-tracking branch 'x86/pie-x86' into q-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Thu, 7 May 2020 08:45:22 +0000 (16:45 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Thu, 7 May 2020 08:45:22 +0000 (16:45 +0800)
commit848deb019e3df4bc7c4c300fdf9aa8f7ba554c90
tree04b6af34fd18bddbdc9ca273301eedd259440978
parent5432c455f79ae1bce1a0f2216a3668191be8bc05
parentc302b67cdba8a4c4791e1822f9d597c4e48dcbb8
Merge remote-tracking branch 'x86/pie-x86' into q-x86

Conflicts:
manifest.xml
treble.mk
init.sh
manifest.xml
treble.mk