From: Dmitry Dementyev <dementyev@google.com>
Date: Wed, 8 Mar 2017 19:13:10 +0000 (+0000)
Subject: resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258
X-Git-Tag: android-x86-8.1-r1~475^2~12^2^2^2^2^2^2^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b7e2545217;p=android-x86%2Fpackages-apps-Settings.git

resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258
am: 3a5e567ab9

Change-Id: Ie14fd1ef35f12fffadf4e241e3cd8146a1063d8a
---

b7e254521758e3257be74b2385a65874ec8b7bda