[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
This commit is contained in:
Beverly
2019-02-19 10:24:45 -08:00
committed by android-build-merger

Diff Content Not Available