| commit | eff31031417f862c0989367ecd9de405c7da28d9 | [log] [tgz] |
|---|---|---|
| author | Peter Wang <tpwang@google.com> | Fri Jul 31 09:55:23 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 31 09:55:23 2020 +0000 |
| tree | 2c2ff36d7b509f0db2941d690de0c99200b356a5 | |
| parent | dcaa22ecae08690e9afa25a5b56733cabb043ca6 [diff] | |
| parent | a4903ada1e5d1d752b6fceb0ecd58e0313ba9092 [diff] |
[automerger skipped] Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission" am: c80aabbd2e am: 1cd92f18b3 -s ours am: a4903ada1e -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: Ic15254afce6f13f0553faf9ec98fc16fe9563c81