[automerger skipped] Merge "Replace allowedNetworkTypes with allowedNetworkTypesForReason" am: 6775f40664 am: 29594edb70 am: cc1715e2c0 -s ours am: ccadb9e31d -s ours

Browse Source

am skip reason: Change-Id I2b981569ad11cf70a558c1952cc2e077464328d8 with SHA-1 60c4163244 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I15661c452dbc2eb7d854a3f408c398f660f7685e

...

This commit is contained in:

SongFerng Wang

2021-03-05 05:38:50 +00:00

committed by Automerger Merge Worker

parent 62fc8f68cd ccadb9e31d

commit 5977f708a2

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available