[automerger skipped] Merge "Rename AllowedNetworkType to AllowedNetworkTypes" am: dfbd3a4072 am: 4bf02f2282 am: 4c8d91f2c8 -s ours am: 1971fbc747 -s ours

Browse Source

am skip reason: Change-Id I48d36d73d016f7aa7fabec25a725abe03b1dee8d with SHA-1 ed6078c020 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614991

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibc9b659e692914b55225437589462a7ff7e41b07

...

This commit is contained in:

SongFerng Wang

2021-03-09 14:26:14 +00:00

committed by Automerger Merge Worker

parent a11e2bb649 1971fbc747

commit 390571671d

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