OSDN Git Service

Merge remote-tracking branch 'cm/cm-14.1' into cm-14.1-x86
authorJaap Jan Meijer <jjmeijer88@gmail.com>
Tue, 15 Nov 2016 18:46:50 +0000 (19:46 +0100)
committerJaap Jan Meijer <jjmeijer88@gmail.com>
Tue, 15 Nov 2016 18:46:50 +0000 (19:46 +0100)
1  2 
Android.mk

diff --cc Android.mk
Simple merge