Skip to content
Commit b3d17d69 authored by Beverly's avatar Beverly Committed by android-build-merger
Browse files

[automerger skipped] Merge "Update keyguard charging text to indicate... 

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

Change-Id: I70aba4c5c7412548c2e94bcb4f6f3b5a8d59a696
parents 18f7673f 0a928f89
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment