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