From: Beverly <beverlyt@google.com>
Date: Tue, 19 Feb 2019 18:24:45 +0000 (-0800)
Subject: [automerger skipped] Merge "Update keyguard charging text to indicate wireless" into... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b3d17d69a4c232bf781120ec4535242d1c15d8a7;p=android-x86%2Fframeworks-base.git

[automerger skipped] Merge "Update keyguard charging text to indicate wireless" into pi-dev am: 06cfb175bd
am: 0a928f8903 -s ours
am skip reason: change_id I9cce8ecaf07f8870164d9ef8a569fcf30db69d85 with SHA1 7d7f699f4a is in history

Change-Id: I70aba4c5c7412548c2e94bcb4f6f3b5a8d59a696
---

b3d17d69a4c232bf781120ec4535242d1c15d8a7