OSDN Git Service

[automerger skipped] Merge "Fix issue that the wifi calling text cannot be customized...
authorYouming Ye <paulye@google.com>
Mon, 25 Feb 2019 23:17:28 +0000 (15:17 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Feb 2019 23:17:28 +0000 (15:17 -0800)
am: ecd1998ea0 -s ours
am skip reason: change_id I6b3f6b06c9cc984ee6a68a19ae317b5d1d4e48e2 with SHA1 af5c05392b is in history

Change-Id: I166d407d0d26e4bb3b270308986076a9ab5fecc3


Trivial merge