[automerger skipped] Merge "Replace subnet mask calculation to Inet4AddressUtils" am: 78b260f5fe am: 12eadd2133 am: b7f1c84f5b -s ours am: 9eda4e7f1e -s ours

Browse Source

am skip reason: Change-Id I38d7d09be612fa4788cf4052bf304d17f0ae79f4 with SHA-1 17a8eacab4 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3c7be91e39b3ef4b3da709247b33e6f5a8a6dc3b

...

This commit is contained in:

Chiachang Wang

2021-02-24 02:59:59 +00:00

committed by Automerger Merge Worker

parent 099560ae98 9eda4e7f1e

commit 4c93df3055

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