From: Lei Yu <jackqdyulei@google.com>
Date: Thu, 10 May 2018 02:25:25 +0000 (-0700)
Subject: Merge changes Ifa91ad93,I14f9696a into pi-dev am: d067cbcfc9
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=bfedf3d50675f12f0eb653603590f541a4fc2ae6;p=android-x86%2Fpackages-apps-Settings.git

Merge changes Ifa91ad93,I14f9696a into pi-dev am: d067cbcfc9
am: 9e639df738

Change-Id: Ic156328bb3249d9c82cc4ea38dc17bc39ddf0d27
---

bfedf3d50675f12f0eb653603590f541a4fc2ae6