[automerger skipped] Merge "Stop using ConnectivityManager for VPNs in DPMS." am: 6ec31401b4 am: d083daabf1 am: 767bfd30e8 -s ours

Browse Source

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifd582c742fb68e100af1ec86d618873c0b186b8a

...

This commit is contained in:

Treehugger Robot

2021-02-19 09:39:54 +00:00

committed by Automerger Merge Worker

parent 065fd6c9cf 767bfd30e8

commit 9cc9faaee1

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