[automerger skipped] Merge "Move UIDS_ALLOWED_ON_RESTRICTED_NETWORKS setting" am: 7cba5f4163 am: 997f6e9893 -s ours am: 9b574bfcbb -s ours

Browse Source

am skip reason: Merged-In Ibea354d8dda1f02652a193820f3f9eb573b9a956 with SHA-1 a1ac564748 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729092

Change-Id: I13eacf9e2db3acbcf196c2c59c8a0d9906b36a93

...

This commit is contained in:

Paul Hu

2021-06-08 08:35:45 +00:00

committed by Automerger Merge Worker

parent 1f08ee5565 9b574bfcbb

commit bc878d5baf

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