Skip to content
Commit 4e5a7bfa authored by Lucas Lin's avatar Lucas Lin Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Remove the usage of NETID_UNSET from Vpn.java" am:... 

[automerger skipped] Merge "Remove the usage of NETID_UNSET from Vpn.java" am: cf1dc9f2 am: e648a78c am: f08c2ce8 -s ours

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

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

Change-Id: I02ac63b20048a4c91a821911c4db0b14805bdef3
parents 94633a52 f08c2ce8
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment