commit | 25be0a92614ad45f2fa573382a28e126912ee1a4 | [log] [tgz] |
---|---|---|
author | Tyler Gunn <tgunn@google.com> | Mon Oct 26 17:29:06 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 26 17:29:06 2020 +0000 |
tree | 711cac7776b9ca49053a63f6a7c95ed48fcfc72f | |
parent | 2e962006482bd31fe5cf61d0d93536991b7985b3 [diff] | |
parent | cf8170171312c4185018b0156b33b8624638e481 [diff] |
[automerger skipped] Merge "Modify the TelecomLoaderService to provide LocalServices to Telecom" am: 5c17953fb7 am: 8f430654a3 am: cf81701713 -s ours am skip reason: Change-Id I3d71331cbc8f01f764cc0b9704416821007feeb5 with SHA-1 4cead2c3e8 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470697 Change-Id: I71db329e51eb56c14b3e3a38e6a4399ea6fbf8f2