From: meijjaa <jjmeijer88@gmail.com>
Date: Sat, 21 Oct 2017 11:57:12 +0000 (+0200)
Subject: Merge remote-tracking branch 'cm/cm-14.1' into cm-14.1-x86
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fsystem-extras.git;a=commitdiff_plain;h=f2e381d763186ac34e9e2d4454d3877f45bf6479

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

f2e381d763186ac34e9e2d4454d3877f45bf6479