| commit | 15221cbc4fdaf95b5555bbf81e9ce4ddf4ad47f4 | [log] [tgz] |
|---|---|---|
| author | Michael Groover <mpgroover@google.com> | Mon Oct 25 17:24:22 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 25 17:24:22 2021 +0000 |
| tree | a7d4acb916ebf6f9818a0036c7a4882deac29e4e | |
| parent | 01eb71be0094eb6718d59684defba426b1d19b8b [diff] | |
| parent | 966b5c7f295766a0e9a6f836b5168ce7cbf8f354 [diff] |
Merge "Add a flag to export LOCKDOWN_RESET receiver in VpnManagerService" am: 5ce00f02e8 am: 3af5f0c1f8 am: 02dc008dcc am: 966b5c7f29 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1845997 Change-Id: I5b60e24de19cad0b7e003dd8438380cb6d8fb28a