[automerger skipped] Merge "Show/hide 5G preferred network type also consider allowed_network_type" am: 7e6c957fea am: 8977c4ce49 -s ours am: 528b77a6e3 -s ours am: 06b5916f4f -s ours am: 86a0d8c7cb -s ours am: d6e2980e9a -s ours

am skip reason: Change-Id I493f2a2c7f4bc32b3fcb8ab2bace5839d8667bd5 with SHA-1 0393bbcc85 is in history

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

Change-Id: I893c8db9512d512603e5fa803c83087766d0099d
This commit is contained in:
Bonian Chen
2020-08-10 12:59:29 +00:00
committed by Automerger Merge Worker

Diff Content Not Available