From: Mark Salyzyn <salyzyn@google.com>
Date: Fri, 5 Aug 2016 17:26:28 +0000 (+0000)
Subject: Merge changes Ic198dc44,I15f000bf
X-Git-Tag: android-x86-8.1-r1~475^2~166^2^2~4
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d3ad45e37cce8da3f1d44f845122fea6ac32a5c9;p=android-x86%2Fpackages-apps-Settings.git

Merge changes Ic198dc44,I15f000bf
am: 682c2ede09  -s ours

Change-Id: I69584d0b778ca9ffa6c8f2965a874cf63fa650d7
---

d3ad45e37cce8da3f1d44f845122fea6ac32a5c9