commit | 7e62609e3766b5ccc71f10077416dfeec3fc0124 | [log] [tgz] |
---|---|---|
author | Junyu Lai <junyulai@google.com> | Mon Sep 14 05:02:21 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 14 05:02:21 2020 +0000 |
tree | 708c36632a319e29e9cdcaf1272c06df7011181e | |
parent | d39fbcc29e230cde41d1faa2eb8c4349a850096f [diff] | |
parent | 1183f4a548af64997f12ec386ef7dfa6c573b673 [diff] |
Merge "Handle lockdown VPN reset intent in ConnectivityService" am: fc6fbde5df am: 8ea944d77a am: 1183f4a548 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1413614 Change-Id: I907b35a02c0957ae57f55ae960df1ff5fce0be8e