OSDN Git Service

[automerger skipped] Merge "Update keyguard charging text to indicate wireless" into...
authorBeverly <beverlyt@google.com>
Tue, 19 Feb 2019 18:24:45 +0000 (10:24 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 19 Feb 2019 18:24:45 +0000 (10:24 -0800)
am: 0a928f8903 -s ours
am skip reason: change_id I9cce8ecaf07f8870164d9ef8a569fcf30db69d85 with SHA1 7d7f699f4a is in history

Change-Id: I70aba4c5c7412548c2e94bcb4f6f3b5a8d59a696


Trivial merge