| commit | f5776165048b89af50d60c8845b91745a005dcbc | [log] [tgz] |
|---|---|---|
| author | Peter Wang <tpwang@google.com> | Fri Jul 31 10:18:58 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 31 10:18:58 2020 +0000 |
| tree | 6dd6d2a59970673f96508af2add27ed252ad2816 | |
| parent | 5cab2b915832f572b3e79a6b2c4d5271023da62f [diff] | |
| parent | c5a1961f76c0106bd460dfe404ccbfb33716406c [diff] |
[automerger skipped] Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission" am: 8ba18c0508 am: 4b6112a42c -s ours am: 68aed47728 -s ours am: c5a1961f76 -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: Ic30f3dc44333a759d86920c5c9d8588d5142eec3