Skip to content
Commit 68aed477 authored by Peter Wang's avatar Peter Wang Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "[Telephony Mainline] Rename...

[automerger skipped] Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission" am: 8ba18c05 am: 4b6112a4 -s ours

am skip reason: Change-Id I7f3b1f5170e032336d9b39b322c49e2b92573586 with SHA-1 ceba2adb is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1260749

Change-Id: I1e06f6cdb0e69e06cf94a543eec83478dabeda14
parents 92378576 4b6112a4
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment