OSDN Git Service

Merge remote-tracking branch 'cm/cm-14.1' into cm-14.1-x86
authorJaap Jan Meijer <jjmeijer88@gmail.com>
Tue, 1 Aug 2017 14:57:06 +0000 (16:57 +0200)
committerJaap Jan Meijer <jjmeijer88@gmail.com>
Tue, 1 Aug 2017 14:57:06 +0000 (16:57 +0200)
commit25ab9e08fbfd8efe888f712fcc2b164c80dee3e2
tree40b150166f4134380cf15bf7e98eeb49320a866b
parentf6e817f7f17f6b95e1200abe2b69deff940ed1a5
parent8b8de5f5bef86df3a3150ad207c730edf13d2273
Merge remote-tracking branch 'cm/cm-14.1' into cm-14.1-x86
Android.mk
res/values/strings.xml