tree 6b78f6b5219344e4d730f42ed81c26da3a4d28d0
parent 977fc0199b8b58a2b0fa01a3d733d01ee07759e6
parent c16abec024a2c7a8e083f624ac97cbc605222716
author Treehugger Robot <treehugger-gerrit@google.com> 1678404535 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1678404535 +0000

[automerger skipped] Merge changes from topics "GetActiveSubscriptionInfo", "getActiveSubInfoCount" am: 793d1f0e57 am: 0b2d96bdf3 am: c16abec024 -s ours

am skip reason: Merged-In I114f28b781c5f09e26fed1b4af8002ff53fb2458 with SHA-1 c1fed85700 is already in history

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

Change-Id: I38742d45b8a88aa5dfbd6c9442d205c913c2d5c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>