| commit | 3b7dd48ddbbd63cdb1719643ccf0d61971b1ed1c | [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 | 0c1ad35a06629c9077433b8cbcf4e86b9bafb81c | |
| parent | 1012aaa906964bc496a23fc67b55b4ef06074cb4 [diff] | |
| parent | a0988882c1f9af5ea849686ebc58f02085a36c8a [diff] |
[automerger skipped] Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission" am: b6ff6f6c2c am: 4b6112a42c -s ours am: 86383582b4 -s ours am: a0988882c1 -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