From: Xin Li <delphij@google.com>
Date: Thu, 7 Dec 2017 04:36:38 +0000 (+0000)
Subject: DO NOT MERGE: Merge Oreo MR1 into master
X-Git-Tag: android-x86-9.0-r1~89^2^2~3^2~28
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2ba6a22abba0af9bf9c4e283644c48ab1c8f98ba;p=android-x86%2Fpackages-apps-Settings.git

DO NOT MERGE: Merge Oreo MR1 into master
am: 7b017d5a2f  -s ours

Change-Id: I38ef4306a74fb9c1ca39903d5a74df5db0753290
---

2ba6a22abba0af9bf9c4e283644c48ab1c8f98ba