From: Phil Weaver Date: Tue, 18 Jul 2017 20:59:48 +0000 (+0000) Subject: Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb... X-Git-Tag: android-x86-8.1-r1~17^2~1^2~3^2^2^2^2^2~7^2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=af26bae8b3527e92b8930d3277353ba10841cb29;p=android-x86%2Fpackages-apps-Settings.git Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3 am: 4b029f8b0d am: 4c70016a94 am: 46592e90a9 am: 55b3b1f349 Change-Id: I89635be6d5f768bd4780dd1b6daeb30e9cbab4d2 --- af26bae8b3527e92b8930d3277353ba10841cb29