commit | de97f2238c14273ed0404ec954cec00ffc62226b | [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 | 557625460e4c5184597eb7ad9d104b5340c0444d | |
parent | 30c708b4e7a0ea5c8d7676e61142ebe27732d528 [diff] | |
parent | 83189041e9d82bcc4f540401cb87069e309654fc [diff] |
Merge "Handle lockdown VPN reset intent in ConnectivityService" am: 68bbf71c37 am: 8ea944d77a am: baedafcc46 am: 83189041e9 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1413614 Change-Id: I7c535b32844f00eef3ad2f4454557f92c3d1befc