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>
Mon, 10 Oct 2016 22:31:05 +0000 (00:31 +0200)
committerJaap Jan Meijer <jjmeijer88@gmail.com>
Mon, 10 Oct 2016 22:31:05 +0000 (00:31 +0200)

Trivial merge