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

[automerger skipped] Merge "Replace MAX_NETWORK_TYPE with TYPE_VPN" am:... 

[automerger skipped] Merge "Replace MAX_NETWORK_TYPE with TYPE_VPN" am: 9639cd62 am: b293e99d am: ab0f3875 -s ours

am skip reason: Merged-In I27579a942a0424db647ad1f3383db78d5a0c69a9 with SHA-1 afdb6590 is already in history

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

Change-Id: Ifeceb015bca61dd6762c2787b52df4ee089c35bc
parents 19b0627a ab0f3875
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