OSDN Git Service

Merge remote-tracking branch 'x86/marshmallow-x86' into cm-13.0-x86
authorJaap Jan Meijer <jjmeijer88@gmail.com>
Tue, 26 Jul 2016 17:07:28 +0000 (19:07 +0200)
committerJaap Jan Meijer <jjmeijer88@gmail.com>
Tue, 26 Jul 2016 17:07:28 +0000 (19:07 +0200)

Trivial merge