From: Phil Weaver <pweaver@google.com>
Date: Thu, 31 Aug 2017 17:34:40 +0000 (+0000)
Subject: resolve merge conflicts of 94c5202965 to oc-dr1-dev
X-Git-Tag: android-x86-9.0-r1~178^2^2^2~23
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f8a7b8aff0;p=android-x86%2Fpackages-apps-Settings.git

resolve merge conflicts of 94c5202965 to oc-dr1-dev
am: f65e790ba0

Change-Id: Id77101229f9c4ceca346f7c2d281d9602f3dd204
---

f8a7b8aff0bd910ba330200da83f6ddc60d66cea