commit | b85be85697c60c1c5ba8759a6dc6c30d3a3771a2 | [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 | 475d83afd8193135d7ec01333fa05dc93a135e64 [diff] | |
parent | a70fc1011e3d3b376297335778eef954f1fd8dc7 [diff] |
[automerger skipped] Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission" am: 617ea90340 am: b882e3f391 -s ours am: a70fc1011e -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