[automerger skipped] Merge "Remove the usage of NETID_UNSET from Vpn.java" am: cf1dc9f287 am: e648a78c15 am: f08c2ce8a9 -s ours

Browse Source

am skip reason: skip tag Change-Id I69d449705b1dc541287c72af8dc7705dc4733109 with SHA-1 2cc371c74b is already in history

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

Change-Id: I02ac63b20048a4c91a821911c4db0b14805bdef3

...

This commit is contained in:

Lucas Lin

2021-03-25 13:10:55 +00:00

committed by Automerger Merge Worker

parent 94633a52ff f08c2ce8a9

commit 4e5a7bfaa3

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