commit | a70fc1011e3d3b376297335778eef954f1fd8dc7 | [log] [tgz] |
---|---|---|
author | Peter Wang <tpwang@google.com> | Fri Jul 31 09:34:47 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 31 09:34:47 2020 +0000 |
tree | 2c2ff36d7b509f0db2941d690de0c99200b356a5 | |
parent | 642beae1fd36a3a70145bc5c12c34d96c6393986 [diff] | |
parent | b882e3f39162882c4e5b88050c52e8097a26a8bf [diff] |
[automerger skipped] Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission" am: 617ea90340 am: b882e3f391 -s ours am skip reason: Change-Id I7f3b1f5170e032336d9b39b322c49e2b92573586 with SHA-1 ceba2adbbd is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1260749 Change-Id: I1e06f6cdb0e69e06cf94a543eec83478dabeda14