OSDN Git Service

Merge remote-tracking branch 'cm/cm-14.1' into cm-14.1-x86
authormeijjaa <jjmeijer88@gmail.com>
Sat, 21 Oct 2017 11:47:42 +0000 (13:47 +0200)
committermeijjaa <jjmeijer88@gmail.com>
Sat, 21 Oct 2017 11:47:42 +0000 (13:47 +0200)

Trivial merge