[automerger skipped] Merge "Remove the reference of new Network(int) in Vpn.java" am: 4e6166801e am: 228f0d9782 am: 6a35ea2e08 -s ours am: 3753311f9f -s ours

Browse Source

am skip reason: skip tag Change-Id I4176dd1298ad8d8e8407eb95b2e6cbb8faf4bc17 with SHA-1 afd9acdb17 is already in history

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

Change-Id: I8ea099f4529d4474fa40246c88c06906d49bce50

...

This commit is contained in:

Junyu Lai

2021-03-23 16:10:45 +00:00

committed by Automerger Merge Worker

parent 7fd18ac469 3753311f9f

commit b0fbe27954

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