| commit | a4903ada1e5d1d752b6fceb0ecd58e0313ba9092 | [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 | f438cf39b72605817172117e24daef6c880191a3 [diff] | |
| parent | 1cd92f18b3de9af3e6b034c5a5dd32d84023daa4 [diff] |
[automerger skipped] Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission" am: c80aabbd2e am: 1cd92f18b3 -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