OSDN Git Service

Merge remote-tracking branch 'x86/marshmallow-x86' into nougat-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Thu, 27 Apr 2017 10:34:39 +0000 (18:34 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Thu, 27 Apr 2017 10:34:39 +0000 (18:34 +0800)
1  2 
init.sh

diff --cc init.sh
Simple merge