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