From: Ajay Nadathur <ajayns@google.com>
Date: Fri, 28 Jul 2017 18:08:18 +0000 (+0000)
Subject: Merge "Update text for lock screen notifications" into oc-mr1-dev am: d2352cdd08
X-Git-Tag: android-x86-9.0-r1~247
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f012c892a2064fe7bef72a0339bbd85e0a89093d;p=android-x86%2Fpackages-apps-Settings.git

Merge "Update text for lock screen notifications" into oc-mr1-dev am: d2352cdd08
am: 4f27a4de98

Change-Id: Ic7caf0cfa42d0f835b238ea17289e68c8e1ac773
---

f012c892a2064fe7bef72a0339bbd85e0a89093d