Skip to content
Commit da47e165 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: 68aed477 -s ours am: c5a1961f -s ours am: f5776165 -s ours

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

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

Change-Id: Ifc57a2934b10301dc50e448cf6603a211500acf9
parents 29ad9c8a f5776165
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