Merge remote-tracking branch 'cm/cm-14.1' into cm-14.1-x86

author Jaap Jan Meijer <jjmeijer88@gmail.com>

Tue, 1 Aug 2017 14:57:06 +0000 (16:57 +0200)

committer Jaap Jan Meijer <jjmeijer88@gmail.com>

Tue, 1 Aug 2017 14:57:06 +0000 (16:57 +0200)
author Jaap Jan Meijer <jjmeijer88@gmail.com>
Tue, 1 Aug 2017 14:57:06 +0000 (16:57 +0200)
committer Jaap Jan Meijer <jjmeijer88@gmail.com>
Tue, 1 Aug 2017 14:57:06 +0000 (16:57 +0200)
diff --cc Android.mk
Simple merge
diff --cc res/values/strings.xml
Simple merge
author	Jaap Jan Meijer <jjmeijer88@gmail.com>
	Tue, 1 Aug 2017 14:57:06 +0000 (16:57 +0200)
committer	Jaap Jan Meijer <jjmeijer88@gmail.com>
	Tue, 1 Aug 2017 14:57:06 +0000 (16:57 +0200)
		1	2
Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history