OSDN Git Service

Merge remote-tracking branch 'cm/cm-14.0' into cm-14.0-x86 cm-14.0-x86
authorJaap Jan Meijer <jjmeijer88@gmail.com>
Wed, 5 Oct 2016 23:15:09 +0000 (01:15 +0200)
committerJaap Jan Meijer <jjmeijer88@gmail.com>
Wed, 5 Oct 2016 23:15:09 +0000 (01:15 +0200)

Trivial merge