OSDN Git Service

Merge remote-tracking branch 'cm/cm-14.1' into cm-14.1-x86
authorJaap Jan Meijer <jjmeijer88@gmail.com>
Sat, 25 Feb 2017 12:05:06 +0000 (13:05 +0100)
committerJaap Jan Meijer <jjmeijer88@gmail.com>
Sat, 25 Feb 2017 12:05:06 +0000 (13:05 +0100)

Trivial merge