OSDN Git Service

Merge remote-tracking branch 'los/cm-14.1' into nougat-x86 nougat-x86 android-x86-7.1-r1 android-x86-7.1-r2 android-x86-7.1-r3 android-x86-7.1-r4 android-x86-7.1-r5
authorJaap Jan Meijer <jjmeijer88@gmail.com>
Wed, 2 Aug 2017 10:03:12 +0000 (12:03 +0200)
committerJaap Jan Meijer <jjmeijer88@gmail.com>
Wed, 2 Aug 2017 10:03:12 +0000 (12:03 +0200)
1  2 
mkshrc

diff --cc mkshrc
Simple merge