OSDN Git Service

Merge remote-tracking branch 'x86/marshmallow-x86' into nougat-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Thu, 8 Sep 2016 06:27:59 +0000 (14:27 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Thu, 8 Sep 2016 06:27:59 +0000 (14:27 +0800)
1  2 
init.sh

diff --cc init.sh
Simple merge