Skip to content
Commit 9cc9faae authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Stop using ConnectivityManager for VPNs in DPMS."... 

[automerger skipped] Merge "Stop using ConnectivityManager for VPNs in DPMS." am: 6ec31401 am: d083daab am: 767bfd30 -s ours

am skip reason: Change-Id I46d9a7768546139690154b1ee1e1bf716b3a2c17 with SHA-1 91fc38b3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifd582c742fb68e100af1ec86d618873c0b186b8a
parents 065fd6c9 767bfd30
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