commit | 9cc9faaee1a2c1aa7e94853bc53ea315120405e0 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Feb 19 09:39:54 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Feb 19 09:39:54 2021 +0000 |
tree | 2921111b40fec85bc52d7f82e42128464c3be7ee | |
parent | 065fd6c9cf01d978ac1f7105386610292b6f5cf2 [diff] | |
parent | 767bfd30e845daffc98424d9b07b208172d61edb [diff] |
[automerger skipped] Merge "Stop using ConnectivityManager for VPNs in DPMS." am: 6ec31401b4 am: d083daabf1 am: 767bfd30e8 -s ours 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