[automerger skipped] Merge "Remove NR NSA from voice network type" am: 46a50b35be am: df7e42a213 -s ours am: b66acd05db -s ours am: a2bc9a8afe -s ours am: e9a9fb9b87 -s ours am: 09e49ae39a -s ours

am skip reason: Change-Id I77d92fab0020da356ae43293016237be7494c1e2 with SHA-1 4b5e95daa1 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1347930

Change-Id: I6796636a1057a34f3c36a62eec59f82146dafac5
This commit is contained in:
Treehugger Robot
2020-07-17 20:13:55 +00:00
committed by Automerger Merge Worker

Diff Content Not Available