diff options
| author | Peter Wang <tpwang@google.com> | 2020-07-31 10:47:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-31 10:47:42 +0000 |
| commit | da47e16505c9d2ab2862882e1112b40c3d5ca8c3 (patch) | |
| tree | 2c8d02402d429d1d9ab938a2094c24253c805f01 /tests/DynamicCodeLoggerIntegrationTests/src/cpp/test_executable.cpp | |
| parent | 29ad9c8a1c3df0baae4e95d029377afa87ee843a (diff) | |
| parent | f5776165048b89af50d60c8845b91745a005dcbc (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: f577616504 -s ours
am skip reason: Change-Id I7f3b1f5170e032336d9b39b322c49e2b92573586 with SHA-1 9487c9e513 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1260749
Change-Id: Ifc57a2934b10301dc50e448cf6603a211500acf9
Diffstat (limited to 'tests/DynamicCodeLoggerIntegrationTests/src/cpp/test_executable.cpp')
0 files changed, 0 insertions, 0 deletions