tree 6883a2f766cb180985381d64c98fee48ab4d6dc9
parent 262219988027d2e65ff12af98b15b9e82a96c454
parent 61315d68f957842e618aca319f4c9d20f15c7a40
author Zoey Chen <zoeychen@google.com> 1598933721 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598933721 +0000

[automerger skipped] Merge "[TelephonyMainline] Rename getMergedSubscriberIdsFromGroup from Telephony perspective" am: c76a0bda37 am: 34c0921bfd -s ours am: 42399048b8 -s ours am: 61315d68f9 -s ours

am skip reason: Change-Id Ia491c01135ea8a416676ce6b02951197b35ea4fd with SHA-1 38003474ab is in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1197841

Change-Id: I2ed5bd33e13cc44de0a013f299807818ee2c25fe